mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-27 18:20:08 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into feature/dic

Browse Source 
* upstream/develop: (39 commits)
  [ticket/11025] Add underline for hover to classes
  [ticket/11025] Replace <b> with <strong> and/or class for semantic styling in subsilver2
  [ticket/11025] Replace <b> with <strong> and/or class for semantic styling
  [ticket/11025] Make last topic titles in forum list Bold
  [prep-release-3.0.11] Update Changelog for 3.0.11-RC2 release.
  [prep-release-3.0.11] Bumping version number for 3.0.11-RC2.
  [ticket/10965] Profile data is only grabbed when show_novalue is enabled
  [ticket/10965] Make sure all profile fields are always grabbed on viewtopic
  [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1
  [ticket/10965] Introduce a new profile field option to display no value
  [ticket/10990] Changes for develop
  [ticket/10990] Do not use comma separator when storing it as a log.
  [ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriate
  [ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)
  [ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)
  [ticket/11012] Fix php_ext change in mock_extension_manager
  [ticket/11012] Normalize $phpEx member vars to $php_ext
  [ticket/11002] Use translating option to rename the Etc/GMT options
  [ticket/11009] Backport build.xml from develop to fix Bamboo Unit Testing.
  [ticket/11008] Change onunload_functions to not use eval()
  ...
This commit is contained in:
Igor Wiedler
2012-07-26 16:12:21 +02:00
parent 8a264228d0 d1e5686866
commit cec4c94f2e
58 changed files with 682 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/viewforum.php
View File

@@ -293,7 +293,7 @@ if (!empty($_EXTRA_URL))
}
$template->assign_vars(array(
'MODERATORS' => (!empty($moderators[$forum_id])) ? implode(', ', $moderators[$forum_id]) : '',
'MODERATORS' => (!empty($moderators[$forum_id])) ? implode($user->lang['COMMA_SEPARATOR'], $moderators[$forum_id]) : '',
'POST_IMG' => ($forum_data['forum_status'] == ITEM_LOCKED) ? $user->img('button_topic_locked', $post_alt) : $user->img('button_topic_new', $post_alt),
'NEWEST_POST_IMG' => $user->img('icon_topic_newest', 'VIEW_NEWEST_POST'),