diff --git a/main/inc/lib/social.lib.php b/main/inc/lib/social.lib.php index 9c29823ff3..81f946295d 100755 --- a/main/inc/lib/social.lib.php +++ b/main/inc/lib/social.lib.php @@ -442,12 +442,11 @@ class SocialManager extends UserManager { if (count($feeds)==0) { return ''; } foreach ($feeds as $url) { if (empty($url)) { continue; } - - $rss = @fetch_rss($url); - $res .= '

'.$rss->channel['title'].'

'; - $res .= '
'; - $i = 1; - if (is_array($rss->items)) { + $rss = @fetch_rss($url); + $i = 1; + if (!empty($rss->items)) { + $res .= '

'.$rss->channel['title'].'

'; + $res .= '
'; foreach ($rss->items as $item) { if ($limit>=0 and $i>$limit) {break;} $res .= '

'.$item['title'].'

'; @@ -455,8 +454,8 @@ class SocialManager extends UserManager { $res .= '
'; $i++; } - } - $res .= '
'; + $res .= '
'; + } } return $res; } diff --git a/main/social/profile.php b/main/social/profile.php index 899186ced5..dcb327223a 100755 --- a/main/social/profile.php +++ b/main/social/profile.php @@ -9,7 +9,7 @@ $language_file = array('registration','messages','userInfo','admin','forum','blog'); $cidReset = true; -require '../inc/global.inc.php'; +require_once '../inc/global.inc.php'; require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php'; require_once api_get_path(LIBRARY_PATH).'social.lib.php'; require_once api_get_path(LIBRARY_PATH).'array.lib.php'; @@ -477,7 +477,6 @@ echo '
'; $html_actions .= ' '.Display :: return_icon('add_multiple_users.gif', get_lang('SocialInvitationToFriends')).' '.get_lang('SendInvitation').''; } } - if (!empty($html_actions )) { echo '
'; @@ -487,7 +486,6 @@ echo '
'; } // Extra information - if ($show_full_profile) { //-- Extra Data $t_uf = Database :: get_main_table(TABLE_MAIN_USER_FIELD); @@ -696,17 +694,16 @@ echo '
'; } } } - echo '
'; - + echo '
'; $user_feeds = SocialManager::get_user_feeds($user_id); - if (is_array($user_feeds )) { + if (!empty($user_feeds )) { echo '
'.get_lang('RSSFeeds').'
'; echo ''; echo '

'; echo '
'; - } + } } //Load plugin center diff --git a/tests/procedures/spanish/chat.xls b/tests/procedures/spanish/chat.xls new file mode 100644 index 0000000000..6bde38652b Binary files /dev/null and b/tests/procedures/spanish/chat.xls differ diff --git a/tests/procedures/spanish/courses.xls b/tests/procedures/spanish/courses.xls new file mode 100644 index 0000000000..9f41c2139b Binary files /dev/null and b/tests/procedures/spanish/courses.xls differ diff --git a/tests/procedures/spanish/dropbox.xls b/tests/procedures/spanish/dropbox.xls new file mode 100644 index 0000000000..9e5b6498ea Binary files /dev/null and b/tests/procedures/spanish/dropbox.xls differ diff --git a/tests/procedures/spanish/group.xls b/tests/procedures/spanish/group.xls new file mode 100644 index 0000000000..2b07e42640 Binary files /dev/null and b/tests/procedures/spanish/group.xls differ diff --git a/tests/procedures/spanish/work.xls b/tests/procedures/spanish/work.xls new file mode 100644 index 0000000000..b22929ae11 Binary files /dev/null and b/tests/procedures/spanish/work.xls differ