chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge

Browse Source
skala
Juan Carlos Raña 15 years ago
parent d8c8adf768 b1e8233076
commit eb534d61bf
2 changed files with 9 additions and 5 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      main/inc/lib/internationalization_database/name_order_conventions.php
  2. 10
      main/inc/lib/message.lib.php

4
main/inc/lib/internationalization_database/name_order_conventions.php
Unescape View File

@ -84,11 +84,11 @@ return array(
'slovenian' => array( 'format' => 'title first_name last_name', 'sort_by' => 'first_name' ),
//'spanish' => array( 'format' => 'title first_name last_name', 'sort_by' => 'last_name' ),
'spanish' => array( 'format' => 'title last_name first_name', 'sort_by' => 'last_name' ),
//'spanish' => array( 'format' => 'title last_name first_name', 'sort_by' => 'last_name' ),
// Some experimental settings for Spanish language:
//'spanish' => array( 'format' => 'title first_name LAST_NAME', 'sort_by' => 'first_name' ), // Western order, last name is uppercase when a full name is assembled
//'spanish' => array( 'format' => 'title first_name LAST_NAME', 'sort_by' => 'last_name' ), // Western order, last name is uppercase when a full name is assembled
//'spanish' => array( 'format' => 'title last_name, first_name', 'sort_by' => 'last_name' ), // Library order
'spanish' => array( 'format' => 'title last_name, first_name', 'sort_by' => 'last_name' ), // Library order
//'spanish' => array( 'format' => 'title LAST_NAME, first_name', 'sort_by' => 'last_name' ), // Library order, last name is uppercase when a full name is assembled
'swahili' => array( 'format' => 'title first_name last_name', 'sort_by' => 'first_name' ),

10
main/inc/lib/message.lib.php
Unescape View File

@ -919,7 +919,9 @@ class MessageManager
$html.= '</div>';
$html.= '<br />';
$html.= '<div class="message-group-author">'.get_lang('From').'&nbsp;<a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$topic['user_sender_id'].'">'.$name.'&nbsp;</a></div>';
$image_path = UserManager::get_user_picture_path_by_id($topic['user_sender_id'], 'web', false, true); $image_repository = $image_path['dir'];
$existing_image = $image_path['file'];
$html.= '<div class="message-group-author"><img src="'.$image_repository.$existing_image.'" alt="'.$name.'" width="44" height="44" title="'.$name.'" />&nbsp;<a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$topic['user_sender_id'].'">'.$name.'&nbsp;</a></div>';
$html.= '<div class="message-group-content">'.$topic['content'].'</div>';
$html.= '<div class="message-attach">'.(!empty($files_attachments)?implode('&nbsp;|&nbsp;',$files_attachments):'').'</div>';
$html.= '</div>';
@ -947,8 +949,10 @@ class MessageManager
$html_items.= '&nbsp;&nbsp;<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=390&width=610&&user_friend='.$current_user_id.'&group_id='.$group_id.'&message_id='.$item['id'].'&action=edit_message_group&anchor_topic=topic_'.$topic['id'].'&topics_page_nr='.intval($_GET['topics_page_nr']).'&items_page_nr='.intval($items_page_nr).'&topic_id='.$topic['id'].'" class="thickbox" title="'.get_lang('Edit').'">'.Display :: return_icon('edit.gif', get_lang('Edit')).'</a>';
}
$html_items.= '</div>';
$html_items.= '<div class="message-group-title">'.Security::remove_XSS($item['title']).'&nbsp;</div>';
$html_items.= '<div class="message-group-author">'.get_lang('From').'&nbsp;<a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$item['user_sender_id'].'">'.$name.'&nbsp;</a></div>';
$html_items.= '<div class="message-group-title">'.Security::remove_XSS($item['title']).'&nbsp;</div>';
$image_path = UserManager::get_user_picture_path_by_id($topic['user_sender_id'], 'web', false, true); $image_repository = $image_path['dir'];
$existing_image = $image_path['file'];
$html_items.= '<div class="message-group-author"><img src="'.$image_repository.$existing_image.'" alt="'.$name.'" width="44" height="44" title="'.$name.'" />&nbsp;<a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$item['user_sender_id'].'">'.$name.'&nbsp;</a></div>';
$html_items.= '<div class="message-group-content">'.$item['content'].'</div>';
if ($item['send_date'] != $item['update_date']) {

Write Preview
Loading…
Cancel
Save