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

[ticket/13454] Add excessively removed code back

Browse source 
PHPBB3-13454
This commit is contained in:
Marc Alexander 2015-12-24 15:44:55 +01:00
parent 73900d1857
commit 3f44f36817
5 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/includes/acp/acp_profile.php
View file

@ -549,7 +549,11 @@ class acp_profile
} }
} }
if (!sizeof($error)) if (sizeof($error))
{
$submit = false;
}
else
{ {
$step = (isset($_REQUEST['next'])) ? $step + 1 : ((isset($_REQUEST['prev'])) ? $step - 1 : $step); $step = (isset($_REQUEST['next'])) ? $step + 1 : ((isset($_REQUEST['prev'])) ? $step - 1 : $step);
} }

1
phpBB/includes/diff/renderer.php
View file

@ -720,6 +720,7 @@ class diff_renderer_side_by_side extends diff_renderer
if (!empty($current_context)) if (!empty($current_context))
{ {
$line = $current_context; $line = $current_context;
$current_context = '';
$output .= '<tr class="unmodified"><td><pre>' . ((strlen($line)) ? $line : '&nbsp;') . '<br /></pre></td>'; $output .= '<tr class="unmodified"><td><pre>' . ((strlen($line)) ? $line : '&nbsp;') . '<br /></pre></td>';
$output .= '<td><pre>' . ((strlen($line)) ? $line : '&nbsp;') . '<br /></pre></td></tr>'; $output .= '<td><pre>' . ((strlen($line)) ? $line : '&nbsp;') . '<br /></pre></td></tr>';

2
phpBB/includes/functions_content.php
View file

@ -763,6 +763,8 @@ function make_clickable_callback($type, $whitespace, $url, $relative_url, $class
// set last_char to empty here, so the variable can be used later to // set last_char to empty here, so the variable can be used later to
// check whether a character was removed // check whether a character was removed
default: default:
$last_char = '';
break;
} }
$short_url = (utf8_strlen($url) > 55) ? utf8_substr($url, 0, 39) . ' ... ' . utf8_substr($url, -10) : $url; $short_url = (utf8_strlen($url) > 55) ? utf8_substr($url, 0, 39) . ' ... ' . utf8_substr($url, -10) : $url;

2
phpBB/includes/functions_convert.php
View file

@ -2201,7 +2201,7 @@ function remove_invalid_users()
function convert_bbcode($message, $convert_size = true, $extended_bbcodes = false) function convert_bbcode($message, $convert_size = true, $extended_bbcodes = false)
{ {
static $orig, $repl, $origx, $replx; static $orig, $repl, $origx, $replx, $str_from, $str_to;
if (empty($orig)) if (empty($orig))
{ {

2
phpBB/phpbb/session.php
View file

@ -1413,7 +1413,7 @@ class session
$sql_ary = array( $sql_ary = array(
'key_id' => (string) md5($key_id), 'key_id' => (string) md5($key_id),
'last_ip' => (string) $user_id, 'last_ip' => (string) $user_ip,
'last_login' => (int) time() 'last_login' => (int) time()
); );