makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-olympus' into develop

Browse source 
* develop-olympus:
  [ticket/9653] Valid XHTML with code BBCode in subsilver2 viewtopic signatures
  [ticket/9656] Remove @ from phpinfo() to get correct error_reporting value.
  [ticket/9665] Allow preview of signature when it is the string "0".
  [ticket/9112] Make sure current user can see most active forum/topic.
  [ticket/9655] Pass E_USER_WARNING, so it doesn't look like a successful action.
  [ticket/9643] Only split $port from $sqlserver, if it's not an IPv6 address.

Conflicts:
	phpBB/styles/subsilver2/template/ucp_profile_signature.html
	phpBB/styles/subsilver2/template/viewtopic_body.html
This commit is contained in:
Andreas Fischer 2010-06-20 22:50:10 +02:00
commit 7d6545bd09
5 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/includes/acp/acp_captcha.php
View file

@ -89,14 +89,14 @@ class acp_captcha
} }
else else
{ {
trigger_error($user->lang['CAPTCHA_UNAVAILABLE'] . adm_back_link($this->u_action)); trigger_error($user->lang['CAPTCHA_UNAVAILABLE'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
} }
trigger_error($user->lang['CONFIG_UPDATED'] . adm_back_link($this->u_action)); trigger_error($user->lang['CONFIG_UPDATED'] . adm_back_link($this->u_action));
} }
else if ($submit) else if ($submit)
{ {
trigger_error($user->lang['FORM_INVALID'] . adm_back_link()); trigger_error($user->lang['FORM_INVALID'] . adm_back_link(), E_USER_WARNING);
} }
else else
{ {

2
phpBB/includes/acp/acp_php_info.php
View file

@ -37,7 +37,7 @@ class acp_php_info
$this->page_title = 'ACP_PHP_INFO'; $this->page_title = 'ACP_PHP_INFO';
ob_start(); ob_start();
@phpinfo(INFO_GENERAL | INFO_CONFIGURATION | INFO_MODULES | INFO_VARIABLES); phpinfo(INFO_GENERAL | INFO_CONFIGURATION | INFO_MODULES | INFO_VARIABLES);
$phpinfo = ob_get_clean(); $phpinfo = ob_get_clean();
$phpinfo = trim($phpinfo); $phpinfo = trim($phpinfo);

5
phpBB/includes/db/postgres.php
View file

@ -46,7 +46,10 @@ class dbal_postgres extends dbal
if ($sqlserver) if ($sqlserver)
{ {
if (strpos($sqlserver, ':') !== false) // $sqlserver can carry a port separated by : for compatibility reasons
// If $sqlserver has more than one : it's probably an IPv6 address.
// In this case we only allow passing a port via the $port variable.
if (substr_count($sqlserver, ':') === 1)
{ {
list($sqlserver, $port) = explode(':', $sqlserver); list($sqlserver, $port) = explode(':', $sqlserver);
} }

7
phpBB/includes/functions_display.php
View file

@ -969,11 +969,16 @@ function display_user_activity(&$userdata)
$forum_ary = array_unique($forum_ary); $forum_ary = array_unique($forum_ary);
$forum_sql = (sizeof($forum_ary)) ? 'AND ' . $db->sql_in_set('forum_id', $forum_ary, true) : ''; $forum_sql = (sizeof($forum_ary)) ? 'AND ' . $db->sql_in_set('forum_id', $forum_ary, true) : '';
$fid_m_approve = $auth->acl_getf('m_approve', true);
$sql_m_approve = (!empty($fid_m_approve)) ? 'OR ' . $db->sql_in_set('forum_id', array_keys($fid_m_approve)) : '';
// Obtain active forum // Obtain active forum
$sql = 'SELECT forum_id, COUNT(post_id) AS num_posts $sql = 'SELECT forum_id, COUNT(post_id) AS num_posts
FROM ' . POSTS_TABLE . ' FROM ' . POSTS_TABLE . '
WHERE poster_id = ' . $userdata['user_id'] . " WHERE poster_id = ' . $userdata['user_id'] . "
AND post_postcount = 1 AND post_postcount = 1
AND (post_approved = 1
$sql_m_approve)
$forum_sql $forum_sql
GROUP BY forum_id GROUP BY forum_id
ORDER BY num_posts DESC"; ORDER BY num_posts DESC";
@ -996,6 +1001,8 @@ function display_user_activity(&$userdata)
FROM ' . POSTS_TABLE . ' FROM ' . POSTS_TABLE . '
WHERE poster_id = ' . $userdata['user_id'] . " WHERE poster_id = ' . $userdata['user_id'] . "
AND post_postcount = 1 AND post_postcount = 1
AND (post_approved = 1
$sql_m_approve)
$forum_sql $forum_sql
GROUP BY topic_id GROUP BY topic_id
ORDER BY num_posts DESC"; ORDER BY num_posts DESC";

2
phpBB/styles/prosilver/template/ucp_profile_signature.html
View file

@ -4,7 +4,7 @@
<h2>{L_TITLE}</h2> <h2>{L_TITLE}</h2>
<!-- IF SIGNATURE_PREVIEW --> <!-- IF SIGNATURE_PREVIEW != '' -->
<div class="panel"> <div class="panel">
<div class="inner"><span class="corners-top"><span></span></span> <div class="inner"><span class="corners-top"><span></span></span>
<h3>{L_SIGNATURE_PREVIEW}</h3> <h3>{L_SIGNATURE_PREVIEW}</h3>