' . "\n"
- . htmlspecialchars($sql_query) . "\n"
+ . htmlspecialchars($sqlQuery) . "\n"
. '' . __('SQL query:') . '' . "\n";
- if (/*overload*/mb_strstr(/*overload*/mb_strtolower($formatted_sql), 'select')
- ) {
+ $formattedSqlToLower = /*overload*/mb_strtolower($formatted_sql);
+ if (/*overload*/mb_strstr($formattedSqlToLower, 'select')) {
// please show me help to the error on select
$error_msg .= self::showMySQLDocu('SELECT');
}
@@ -1059,8 +1059,8 @@ class PMA_Util
$query_too_big = false;
- if (/*overload*/mb_strlen($query_base) > $cfg['MaxCharactersInDisplayedSQL']
- ) {
+ $queryLength = /*overload*/mb_strlen($query_base);
+ if ($queryLength > $cfg['MaxCharactersInDisplayedSQL']) {
// when the query is large (for example an INSERT of binary
// data), the parser chokes; so avoid parsing the query
$query_too_big = true;
@@ -1165,7 +1165,8 @@ class PMA_Util
} elseif (preg_match(
'@^EXPLAIN[[:space:]]+SELECT[[:space:]]+@i', $sql_query
)) {
- $explain_params['sql_query'] = /*overload*/mb_substr($sql_query, 8);
+ $explain_params['sql_query']
+ = /*overload*/mb_substr($sql_query, 8);
$_message = __('Skip Explain SQL');
}
if (isset($explain_params['sql_query']) && isset($_message)) {
@@ -1822,8 +1823,9 @@ class PMA_Util
if ($suhosin_get_MaxValueLength) {
$query_parts = self::splitURLQuery($url);
foreach ($query_parts as $query_pair) {
- list($eachvar, $eachval) = explode('=', $query_pair);
- if (/*overload*/mb_strlen($eachval) > $suhosin_get_MaxValueLength) {
+ list(, $eachval) = explode('=', $query_pair);
+ if (/*overload*/mb_strlen($eachval) > $suhosin_get_MaxValueLength
+ ) {
$in_suhosin_limits = false;
break;
}
@@ -2951,7 +2953,7 @@ class PMA_Util
/*overload*/mb_substr(
$columnspec,
$first_bracket_pos + 1,
- (/*overload*/mb_strrpos($columnspec, ')') - $first_bracket_pos - 1)
+ /*overload*/mb_strrpos($columnspec, ')') - $first_bracket_pos - 1
)
);
// convert to lowercase just to be sure
@@ -4354,7 +4356,11 @@ class PMA_Util
}
$value .= '000000';
- return /*overload*/mb_substr($value, 0, /*overload*/mb_strpos($value, '.') + 7);
+ return /*overload*/mb_substr(
+ $value,
+ 0,
+ /*overload*/mb_strpos($value, '.') + 7
+ );
}
/**
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index 9974f99f18..d1104f611f 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -745,11 +745,12 @@ if (! defined('PMA_MINIMUM_COMMON')) {
&& ! is_numeric($_REQUEST['server'])
) {
foreach ($cfg['Servers'] as $i => $server) {
- $verboseLower = /*overload*/mb_strtolower($server['verbose']);
+ $verboseToLower = /*overload*/mb_strtolower($server['verbose']);
+ $serverToLower = /*overload*/mb_strtolower($_REQUEST['server']);
if ($server['host'] == $_REQUEST['server']
|| $server['verbose'] == $_REQUEST['server']
- || $verboseLower == /*overload*/mb_strtolower($_REQUEST['server'])
- || md5($verboseLower) == /*overload*/mb_strtolower($_REQUEST['server'])
+ || $verboseToLower == $serverToLower
+ || md5($verboseToLower) == $serverToLower
) {
$_REQUEST['server'] = $i;
break;
diff --git a/libraries/config/Form.class.php b/libraries/config/Form.class.php
index 459840793c..71ba6eb0d1 100644
--- a/libraries/config/Form.class.php
+++ b/libraries/config/Form.class.php
@@ -76,7 +76,10 @@ class Form
public function getOptionType($option_name)
{
$key = ltrim(
- /*overload*/mb_substr($option_name, /*overload*/mb_strrpos($option_name, '/')),
+ /*overload*/mb_substr(
+ $option_name,
+ /*overload*/mb_strrpos($option_name, '/')
+ ),
'/'
);
return isset($this->_fieldsTypes[$key])
diff --git a/libraries/core.lib.php b/libraries/core.lib.php
index 6a0bb9ac6e..26c5e34576 100644
--- a/libraries/core.lib.php
+++ b/libraries/core.lib.php
@@ -515,13 +515,21 @@ function PMA_checkPageValidity(&$page, $whitelist)
return true;
}
- $_page = /*overload*/mb_substr($page, 0, /*overload*/mb_strpos($page . '?', '?'));
+ $_page = /*overload*/mb_substr(
+ $page,
+ 0,
+ /*overload*/mb_strpos($page . '?', '?')
+ );
if (in_array($_page, $whitelist)) {
return true;
}
$_page = urldecode($page);
- $_page = /*overload*/mb_substr($_page, 0, /*overload*/mb_strpos($_page . '?', '?'));
+ $_page = /*overload*/mb_substr(
+ $_page,
+ 0,
+ /*overload*/mb_strpos($_page . '?', '?')
+ );
if (in_array($_page, $whitelist)) {
return true;
}
@@ -1032,7 +1040,7 @@ function PMA_setPostAsGlobal($post_patterns)
/**
* Creates some globals from $_REQUEST
*
- * @param string $param db|table
+ * @param string $param db|table
*
* @return void
*/
diff --git a/libraries/export.lib.php b/libraries/export.lib.php
index 45e5154858..30716bd3ed 100644
--- a/libraries/export.lib.php
+++ b/libraries/export.lib.php
@@ -365,7 +365,7 @@ function PMA_closeExportFile($file_handle, $dump_buffer, $save_filename)
$write_result = @fwrite($file_handle, $dump_buffer);
fclose($file_handle);
if (/*overload*/mb_strlen($dump_buffer) > 0
- && (! $write_result || ($write_result != /*overload*/mb_strlen($dump_buffer)))
+ && (! $write_result || $write_result != /*overload*/mb_strlen($dump_buffer))
) {
$message = new PMA_Message(
__('Insufficient space to save the file %s.'),
diff --git a/libraries/gis/GIS_Geometrycollection.class.php b/libraries/gis/GIS_Geometrycollection.class.php
index 89b2dee6dd..6af664a3e2 100644
--- a/libraries/gis/GIS_Geometrycollection.class.php
+++ b/libraries/gis/GIS_Geometrycollection.class.php
@@ -338,7 +338,11 @@ class PMA_GIS_Geometrycollection extends PMA_GIS_Geometry
$wkt = $data['wkt'];
// Trim to remove leading 'GEOMETRYCOLLECTION(' and trailing ')'
- $goem_col = /*overload*/mb_substr($wkt, 19, (/*overload*/mb_strlen($wkt) - 20));
+ $goem_col = /*overload*/mb_substr(
+ $wkt,
+ 19,
+ /*overload*/mb_strlen($wkt) - 20
+ );
// Split the geometry collection object to get its constituents.
$sub_parts = $this->_explodeGeomCol($goem_col);
$params['GEOMETRYCOLLECTION']['geom_count'] = count($sub_parts);
diff --git a/libraries/gis/GIS_Linestring.class.php b/libraries/gis/GIS_Linestring.class.php
index eec9878ad6..eb1e8ce122 100644
--- a/libraries/gis/GIS_Linestring.class.php
+++ b/libraries/gis/GIS_Linestring.class.php
@@ -303,7 +303,11 @@ class PMA_GIS_Linestring extends PMA_GIS_Geometry
}
// Trim to remove leading 'LINESTRING(' and trailing ')'
- $linestring = /*overload*/mb_substr($wkt, 11, (/*overload*/mb_strlen($wkt) - 12));
+ $linestring = /*overload*/mb_substr(
+ $wkt,
+ 11,
+ /*overload*/mb_strlen($wkt) - 12
+ );
$points_arr = $this->extractPoints($linestring, null);
$no_of_points = count($points_arr);
diff --git a/libraries/gis/GIS_Multipoint.class.php b/libraries/gis/GIS_Multipoint.class.php
index d49e9f45ca..ccf1b35eb9 100644
--- a/libraries/gis/GIS_Multipoint.class.php
+++ b/libraries/gis/GIS_Multipoint.class.php
@@ -56,7 +56,11 @@ class PMA_GIS_Multipoint extends PMA_GIS_Geometry
public function scaleRow($spatial)
{
// Trim to remove leading 'MULTIPOINT(' and trailing ')'
- $multipoint = /*overload*/mb_substr($spatial, 11, /*overload*/mb_strlen($spatial) - 12);
+ $multipoint = /*overload*/mb_substr(
+ $spatial,
+ 11,
+ /*overload*/mb_strlen($spatial) - 12
+ );
return $this->setMinMax($multipoint, array());
}
diff --git a/libraries/gis/GIS_Multipolygon.class.php b/libraries/gis/GIS_Multipolygon.class.php
index 419c2d10c4..15e0678f4e 100644
--- a/libraries/gis/GIS_Multipolygon.class.php
+++ b/libraries/gis/GIS_Multipolygon.class.php
@@ -389,7 +389,11 @@ class PMA_GIS_Multipolygon extends PMA_GIS_Geometry
&& trim($data_row[$k][$i][$j]['y']) != '')
? $data_row[$k][$i][$j]['y'] : $empty) . ',';
}
- $wkt = /*overload*/mb_substr($wkt, 0, /*overload*/mb_strlen($wkt) - 1);
+ $wkt = /*overload*/mb_substr(
+ $wkt,
+ 0,
+ /*overload*/mb_strlen($wkt) - 1
+ );
$wkt .= '),';
}
$wkt = /*overload*/mb_substr($wkt, 0, /*overload*/mb_strlen($wkt) - 1);
@@ -473,7 +477,11 @@ class PMA_GIS_Multipolygon extends PMA_GIS_Geometry
foreach ($row_data['parts'][$j]['points'] as $innerPoint) {
$wkt .= $innerPoint['x'] . ' ' . $innerPoint['y'] . ',';
}
- $wkt = /*overload*/mb_substr($wkt, 0, /*overload*/mb_strlen($wkt) - 1);
+ $wkt = /*overload*/mb_substr(
+ $wkt,
+ 0,
+ /*overload*/mb_strlen($wkt) - 1
+ );
$wkt .= ')'; // end of inner ring
}
}
@@ -509,7 +517,11 @@ class PMA_GIS_Multipolygon extends PMA_GIS_Geometry
}
// Trim to remove leading 'MULTIPOLYGON(((' and trailing ')))'
- $multipolygon = /*overload*/mb_substr($wkt, 15, /*overload*/mb_strlen($wkt) - 18);
+ $multipolygon = /*overload*/mb_substr(
+ $wkt,
+ 15,
+ /*overload*/mb_strlen($wkt) - 18
+ );
// Separate each polygon
$polygons = explode(")),((", $multipolygon);
diff --git a/libraries/gis/GIS_Point.class.php b/libraries/gis/GIS_Point.class.php
index 98aa0b0e66..52cca3e65e 100644
--- a/libraries/gis/GIS_Point.class.php
+++ b/libraries/gis/GIS_Point.class.php
@@ -56,7 +56,11 @@ class PMA_GIS_Point extends PMA_GIS_Geometry
public function scaleRow($spatial)
{
// Trim to remove leading 'POINT(' and trailing ')'
- $point = /*overload*/mb_substr($spatial, 6, /*overload*/mb_strlen($spatial) - 7);
+ $point = /*overload*/mb_substr(
+ $spatial,
+ 6,
+ /*overload*/mb_strlen($spatial) - 7
+ );
return $this->setMinMax($point, array());
}
@@ -83,7 +87,11 @@ class PMA_GIS_Point extends PMA_GIS_Geometry
$color = imagecolorallocate($image, $red, $green, $blue);
// Trim to remove leading 'POINT(' and trailing ')'
- $point = /*overload*/mb_substr($spatial, 6, /*overload*/mb_strlen($spatial) - 7);
+ $point = /*overload*/mb_substr(
+ $spatial,
+ 6,
+ /*overload*/mb_strlen($spatial) - 7
+ );
$points_arr = $this->extractPoints($point, $scale_data);
// draw a small circle to mark the point
@@ -124,7 +132,11 @@ class PMA_GIS_Point extends PMA_GIS_Geometry
$line = array('width' => 1.25, 'color' => array($red, $green, $blue));
// Trim to remove leading 'POINT(' and trailing ')'
- $point = /*overload*/mb_substr($spatial, 6, /*overload*/mb_strlen($spatial) - 7);
+ $point = /*overload*/mb_substr(
+ $spatial,
+ 6,
+ /*overload*/mb_strlen($spatial) - 7
+ );
$points_arr = $this->extractPoints($point, $scale_data);
// draw a small circle to mark the point
@@ -165,7 +177,11 @@ class PMA_GIS_Point extends PMA_GIS_Geometry
);
// Trim to remove leading 'POINT(' and trailing ')'
- $point = /*overload*/mb_substr($spatial, 6, /*overload*/mb_strlen($spatial) - 7);
+ $point = /*overload*/mb_substr(
+ $spatial,
+ 6,
+ /*overload*/mb_strlen($spatial) - 7
+ );
$points_arr = $this->extractPoints($point, $scale_data);
$row = '';
@@ -212,7 +228,11 @@ class PMA_GIS_Point extends PMA_GIS_Geometry
$result = $this->getBoundsForOl($srid, $scale_data);
// Trim to remove leading 'POINT(' and trailing ')'
- $point = /*overload*/mb_substr($spatial, 6, /*overload*/mb_strlen($spatial) - 7);
+ $point = /*overload*/mb_substr(
+ $spatial,
+ 6,
+ /*overload*/mb_strlen($spatial) - 7
+ );
$points_arr = $this->extractPoints($point, null);
if ($points_arr[0][0] != '' && $points_arr[0][1] != '') {
diff --git a/libraries/gis/GIS_Polygon.class.php b/libraries/gis/GIS_Polygon.class.php
index 534bb699f9..6727eea8b3 100644
--- a/libraries/gis/GIS_Polygon.class.php
+++ b/libraries/gis/GIS_Polygon.class.php
@@ -152,7 +152,11 @@ class PMA_GIS_Polygon extends PMA_GIS_Geometry
$color = array($red, $green, $blue);
// Trim to remove leading 'POLYGON((' and trailing '))'
- $polygon = /*overload*/mb_substr($spatial, 9, /*overload*/mb_strlen($spatial) - 11);
+ $polygon = /*overload*/mb_substr(
+ $spatial,
+ 9,
+ /*overload*/mb_strlen($spatial) - 11
+ );
// If the polygon doesn't have an inner polygon
if (/*overload*/mb_strpos($polygon, "),(") === false) {
@@ -554,8 +558,8 @@ class PMA_GIS_Polygon extends PMA_GIS_Geometry
}
// Trim to remove leading 'POLYGON((' and trailing '))'
- $polygon = /*overload*/mb_substr($wkt, 9, (/*overload*/mb_strlen($wkt) - 11));
- // Seperate each linestring
+ $polygon = /*overload*/mb_substr($wkt, 9, /*overload*/mb_strlen($wkt) - 11);
+ // Separate each linestring
$linerings = explode("),(", $polygon);
$params[$index]['POLYGON']['no_of_lines'] = count($linerings);
diff --git a/libraries/import.lib.php b/libraries/import.lib.php
index 28e6425af6..ad7ae2b85d 100644
--- a/libraries/import.lib.php
+++ b/libraries/import.lib.php
@@ -126,8 +126,6 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false,
);
$error = true;
} else {
-
-
$executed_queries++;
$pattern = '/^[\s]*(SELECT|SHOW|HANDLER)/i';
@@ -379,7 +377,10 @@ function PMA_importGetNextChunk($size = 32768)
break;
case 'application/zip':
$result = /*overload*/mb_substr($GLOBALS['import_text'], 0, $size);
- $GLOBALS['import_text'] = /*overload*/mb_substr($GLOBALS['import_text'], $size);
+ $GLOBALS['import_text'] = /*overload*/mb_substr(
+ $GLOBALS['import_text'],
+ $size
+ );
$GLOBALS['finished'] = empty($GLOBALS['import_text']);
break;
case 'none':
diff --git a/libraries/mult_submits.lib.php b/libraries/mult_submits.lib.php
index c10904b4a7..f80fe76005 100644
--- a/libraries/mult_submits.lib.php
+++ b/libraries/mult_submits.lib.php
@@ -226,10 +226,17 @@ function PMA_getQueryStrFromSelected(
case 'replace_prefix_tbl':
$current = $selected[$i];
- $subFromPrefix = /*overload*/mb_substr($current, 0, /*overload*/mb_strlen($from_prefix));
+ $subFromPrefix = /*overload*/mb_substr(
+ $current,
+ 0,
+ /*overload*/mb_strlen($from_prefix)
+ );
if ($subFromPrefix == $from_prefix) {
$newtablename = $to_prefix
- . /*overload*/mb_substr($current, /*overload*/mb_strlen($from_prefix));
+ . /*overload*/mb_substr(
+ $current,
+ /*overload*/mb_strlen($from_prefix)
+ );
} else {
$newtablename = $current;
}
diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php
index d5725f4116..d70da735af 100644
--- a/libraries/plugin_interface.lib.php
+++ b/libraries/plugin_interface.lib.php
@@ -193,7 +193,10 @@ function PMA_pluginGetChoice($section, $name, &$list, $cfgname = null)
$default = PMA_pluginGetDefault($section, $cfgname);
foreach ($list as $plugin) {
$plugin_name = /*overload*/mb_strtolower(
- /*overload*/mb_substr(get_class($plugin), /*overload*/mb_strlen($section))
+ /*overload*/mb_substr(
+ get_class($plugin),
+ /*overload*/mb_strlen($section)
+ )
);
$ret .= '' . "\n"
. ' '
. htmlspecialchars(
- (!/*overload*/mb_strlen($dbname)) ? $row['Db'] : $row['Table_name']
+ (!$dbNameLength)
+ ? $row['Db']
+ : $row['Table_name']
)
. ' ' . "\n"
. '' . "\n"
@@ -2704,8 +2709,8 @@ function PMA_getHtmlForUserRights($db_rights, $dbname,
) . "\n"
. ''
- . ((((!/*overload*/mb_strlen($dbname)) && $row['Grant_priv'] == 'Y')
- || (/*overload*/mb_strlen($dbname)
+ . ((((!$dbNameLength) && $row['Grant_priv'] == 'Y')
+ || ($dbNameLength
&& in_array('Grant', explode(',', $row['Table_priv']))))
? __('Yes')
: __('No'))
@@ -2722,8 +2727,8 @@ function PMA_getHtmlForUserRights($db_rights, $dbname,
'edit',
$username,
$hostname,
- (!/*overload*/mb_strlen($dbname)) ? $row['Db'] : $dbname,
- (!/*overload*/mb_strlen($dbname)) ? '' : $row['Table_name']
+ (!$dbNameLength) ? $row['Db'] : $dbname,
+ (!$dbNameLength) ? '' : $row['Table_name']
);
$html_output .= ' ' . "\n"
. ' ';
@@ -2735,8 +2740,8 @@ function PMA_getHtmlForUserRights($db_rights, $dbname,
'revoke',
$username,
$hostname,
- (! /*overload*/mb_strlen($dbname)) ? $row['Db'] : $dbname,
- (! /*overload*/mb_strlen($dbname)) ? '' : $row['Table_name']
+ (!$dbNameLength) ? $row['Db'] : $dbname,
+ (!$dbNameLength) ? '' : $row['Table_name']
);
}
$html_output .= ' ' . "\n"
diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php
index 671a855b88..3a498f3633 100644
--- a/libraries/sqlparser.lib.php
+++ b/libraries/sqlparser.lib.php
@@ -1242,7 +1242,9 @@ function PMA_SQP_analyze($arr)
if ($arr[$i]['type'] == 'alpha_reservedWord') {
// We don't know what type of query yet, so run this
if ($subresult['querytype'] == '') {
- $subresult['querytype'] = /*overload*/mb_strtoupper($arr[$i]['data']);
+ $subresult['querytype'] = /*overload*/mb_strtoupper(
+ $arr[$i]['data']
+ );
} // end if (querytype was empty)
// Check if we support this type of query
@@ -2127,7 +2129,9 @@ function PMA_SQP_analyze($arr)
if (isset($arr[$i+1])
&& $arr[$i+1]['type'] == 'alpha_reservedWord'
) {
- $second_upper_data = /*overload*/mb_strtoupper($arr[$i+1]['data']);
+ $second_upper_data = /*overload*/mb_strtoupper(
+ $arr[$i+1]['data']
+ );
if ($second_upper_data == 'DELETE') {
$clause = 'on_delete';
}
@@ -2143,7 +2147,9 @@ function PMA_SQP_analyze($arr)
|| ($arr[$i+2]['type'] == 'alpha_identifier'
&& /*overload*/mb_strtoupper($arr[$i+2]['data'])=='NO'))
) {
- $third_upper_data = /*overload*/mb_strtoupper($arr[$i+2]['data']);
+ $third_upper_data = /*overload*/mb_strtoupper(
+ $arr[$i+2]['data']
+ );
if ($third_upper_data == 'CASCADE'
|| $third_upper_data == 'RESTRICT'
) {
@@ -2159,7 +2165,9 @@ function PMA_SQP_analyze($arr)
if ($clause == 'on_update'
&& $in_timestamp_options
) {
- $create_table_fields[$current_identifier]['on_update_current_timestamp'] = true;
+ $create_table_fields[$current_identifier]
+ ['on_update_current_timestamp']
+ = true;
$seen_default = false;
}
diff --git a/libraries/stringNative.lib.php b/libraries/stringNative.lib.php
index 6af2c12b33..3bc11cafa5 100644
--- a/libraries/stringNative.lib.php
+++ b/libraries/stringNative.lib.php
@@ -4,6 +4,7 @@
* If mb_* functions don't exist, we create the ones we need and they'll use the
* standard string functions.
* All mb_* functions created by pMA should behave as mb_* functions.
+ *
* @package PhpMyAdmin
*/
if (!defined('PHPMYADMIN')) {
diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index bb31e0ec9b..4b8b3d978f 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -926,12 +926,14 @@ function PMA_getHtmlForColumnIndexes($columnNumber, $ci, $ci_offset, $columnMeta
function PMA_getHtmlForIndexTypeOption($columnNumber, $columnMeta, $type, $key)
{
- $html = '';
return $html;
}
diff --git a/libraries/transformations.lib.php b/libraries/transformations.lib.php
index 5f828d401e..7e33e91411 100644
--- a/libraries/transformations.lib.php
+++ b/libraries/transformations.lib.php
@@ -311,8 +311,9 @@ function PMA_setMIME($db, $table, $key, $mimetype, $transformation,
$row = @$GLOBALS['dbi']->fetchAssoc($test_rs);
$GLOBALS['dbi']->freeResult($test_rs);
+ $transformationLength = /*overload*/mb_strlen($transformation);
if (! $forcedelete
- && (/*overload*/mb_strlen($mimetype) || /*overload*/mb_strlen($transformation)
+ && (/*overload*/mb_strlen($mimetype) || $transformationLength
|| /*overload*/mb_strlen($transformationOpts)
|| /*overload*/mb_strlen($row['comment']))
) {
diff --git a/sql.php b/sql.php
index 9d05f065ac..ddccdae201 100644
--- a/sql.php
+++ b/sql.php
@@ -113,7 +113,9 @@ if (isset($_REQUEST['set_col_prefs']) && $_REQUEST['set_col_prefs'] == true) {
// Default to browse if no query set and we have table
// (needed for browsing from DefaultTabTable)
-if (empty($sql_query) && /*overload*/mb_strlen($table) && /*overload*/mb_strlen($db)) {
+$tableLength = /*overload*/mb_strlen($table);
+$dbLength = /*overload*/mb_strlen($db);
+if (empty($sql_query) && $tableLength && $dbLength) {
$sql_query = PMA_getDefaultSqlQueryForBrowse($db, $table);
// set $goto to what will be displayed if query returns 0 rows
diff --git a/tbl_chart.php b/tbl_chart.php
index f9609c9094..283aaceba8 100644
--- a/tbl_chart.php
+++ b/tbl_chart.php
@@ -9,9 +9,6 @@
require_once 'libraries/common.inc.php';
require_once 'libraries/tbl_chart.lib.php';
-/** @var PMA_String $pmaString */
-$pmaString = $GLOBALS['PMA_String'];
-
/*
* Execute the query and return the result
*/
@@ -21,8 +18,9 @@ if (isset($_REQUEST['ajax_request'])
) {
$response = PMA_Response::getInstance();
- if (/*overload*/mb_strlen($GLOBALS['table']) && /*overload*/mb_strlen($GLOBALS['db'])
- ) {
+ $tableLength = /*overload*/mb_strlen($GLOBALS['table']);
+ $dbLength = /*overload*/mb_strlen($GLOBALS['db']);
+ if ($tableLength && $dbLength) {
include './libraries/tbl_common.inc.php';
}
diff --git a/tbl_printview.php b/tbl_printview.php
index 4d55d7d5c5..f8ca99d908 100644
--- a/tbl_printview.php
+++ b/tbl_printview.php
@@ -31,16 +31,13 @@ require_once 'libraries/tbl_printview.lib.php';
$cfgRelation = PMA_getRelationsParam();
-/** @var PMA_String $pmaString */
-$pmaString = $GLOBALS['PMA_String'];
-
/**
* Defines the url to return to in case of error in a sql statement
*/
if (/*overload*/mb_strlen($table)) {
- $err_url = 'tbl_sql.php?' . PMA_URL_getCommon(array(
- 'db' => $db, 'table' => $table
- ));
+ $err_url = 'tbl_sql.php?' . PMA_URL_getCommon(
+ array('db' => $db, 'table' => $table)
+ );
} else {
$err_url = 'db_sql.php' . PMA_URL_getCommon(array('db' => $db));
}