mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

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

Browse Source 
* upstream/develop: (255 commits)
  [ticket/10935] Limit number of PM rules per user to 5000
  [ticket/10801] Fixed quickmod tools.
  [ticket/9551] uncomment line and change length to 255
  [ticket/10925] Clarify installation requirements for SQLite
  [ticket/10938] Serve subforum listing on forumlist from template loop
  [ticket/10640] Change subject length in mcp in subsilver
  [ticket/10640] Change subject length in MCP
  [ticket/10640] Do not change default value of truncate_string()
  [ticket/10640] Change maximum subject length
  [ticket/10936] remove PCRE and mbstring support check
  [ticket/10936] fix language key
  [ticket/10829] Delete T_STYLESHEET_NAME - no longer used.
  [ticket/10829] $style_name -> $style_path in style class.
  [ticket/10743] Renaming user->theme
  [ticket/10743] Changing obtain_cfg_items
  [ticket/10882] Fix test name - oops.
  [ticket/10931] Apply strtolower() correctly, i.e. not on false.
  [ticket/10931] Also test get_bytes() and get_string() with false.
  [ticket/10931] Make to_numeric function globally available.
  [ticket/10932] Use included composer.phar in build process
  ...

Conflicts:
	phpBB/includes/mcp/mcp_warn.php
	phpBB/install/database_update.php
	phpBB/styles/prosilver/template/ucp_avatar_options.html
This commit is contained in:
Igor Wiedler
2012-06-27 14:47:13 +02:00
parent f273ab16ae 85ea062a05
commit 1b3cb68c2f
254 changed files with 2817 additions and 1472 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
phpBB/viewtopic.php
View File

@@ -1099,7 +1099,7 @@ while ($row = $db->sql_fetchrow($result))
{
$user_sig = '';
// We add the signature to every posters entry because enable_sig is post dependant
// We add the signature to every posters entry because enable_sig is post dependent
if ($row['user_sig'] && $config['allow_sig'] && $user->optionget('viewsigs'))
{
$user_sig = $row['user_sig'];
@@ -1629,7 +1629,8 @@ else
$all_marked_read = true;
}
// If there are absolutely no more unread posts in this forum and unread posts shown, we can savely show the #unread link
// If there are absolutely no more unread posts in this forum
// and unread posts shown, we can safely show the #unread link
if ($all_marked_read)
{
if ($post_unread)