gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2016-07-29 13:58:25 +02:00
commit 513c6037e0
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/openid.php
View File

@ -89,7 +89,7 @@ $base .= '://' . $_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT'];
$realm = $base . '/';
$returnTo = $base . dirname($_SERVER['PHP_SELF']);
if ($returnTo[mb_strlen($returnTo) - 1] != '/') {
if ($returnTo[strlen($returnTo) - 1] != '/') {
$returnTo .= '/';
}
$returnTo .= 'openid.php';

2
libraries/server_status_monitor.lib.php
View File

@ -675,7 +675,7 @@ function PMA_getJsonForLogDataTypeGeneral($start, $end)
$temp = $return['rows'][$insertTablesFirst]['argument'];
$return['rows'][$insertTablesFirst]['argument']
.= PMA_getSuspensionPoints(
$temp[mb_strlen($temp) - 1]
$temp[strlen($temp) - 1]
);
// Group this value, thus do not add to the result list

4
libraries/transformations.lib.php
View File

@ -51,7 +51,7 @@ function PMA_Transformation_getOptions($option_string)
$trimmed = trim($option);
if (mb_strlen($trimmed) > 1
&& $trimmed[0] == "'"
&& $trimmed[mb_strlen($trimmed) - 1] == "'"
&& $trimmed[strlen($trimmed) - 1] == "'"
) {
// '...'
$option = mb_substr($trimmed, 1, -1);
@ -62,7 +62,7 @@ function PMA_Transformation_getOptions($option_string)
// ...,
$trimmed .= ',' . $option;
$rtrimmed = rtrim($trimmed);
if ($rtrimmed[mb_strlen($rtrimmed) - 1] == "'") {
if ($rtrimmed[strlen($rtrimmed) - 1] == "'") {
// ,...'
break;
}