Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaurício Meneghini Fauth <mauricio@fauth.dev>2020-09-08 19:32:25 +0300
committerMaurício Meneghini Fauth <mauricio@fauth.dev>2020-09-08 19:32:25 +0300
commit3c21cf1853a0d2aaef379113e8fbf4676dacb83e (patch)
tree890e150ffa58e6cade6e7c5565560f0292021793 /libraries/classes/Common.php
parent37289a57b2ed77c3d6176d91b577f022bef6da6b (diff)
Remove url_query PHP global
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
Diffstat (limited to 'libraries/classes/Common.php')
-rw-r--r--libraries/classes/Common.php23
1 files changed, 3 insertions, 20 deletions
diff --git a/libraries/classes/Common.php b/libraries/classes/Common.php
index 8de209a8c5..f1b61300c4 100644
--- a/libraries/classes/Common.php
+++ b/libraries/classes/Common.php
@@ -16,7 +16,7 @@ final class Common
{
public static function server(): void
{
- global $db, $table, $url_query, $viewing_mode, $err_url, $is_grantuser, $is_createuser, $dbi;
+ global $db, $table, $viewing_mode, $err_url, $is_grantuser, $is_createuser, $dbi;
/**
* Handles some variables that may have been sent by the calling script
@@ -30,11 +30,6 @@ final class Common
}
/**
- * Set parameters for links
- */
- $url_query = Url::getCommon();
-
- /**
* Defines the urls to return to in case of error in a sql statement
*/
$err_url = Url::getFromRoute('/');
@@ -53,7 +48,7 @@ final class Common
public static function database(): void
{
global $cfg, $db, $is_show_stats, $db_is_system_schema, $err_url;
- global $message, $dbi, $url_query, $errno, $is_db, $err_url_0;
+ global $message, $dbi, $errno, $is_db, $err_url_0;
Util::checkParameters(['db']);
@@ -180,16 +175,11 @@ final class Common
);
}
}
-
- /**
- * Set parameters for links
- */
- $url_query = Url::getCommon(['db' => $db]);
}
public static function table(): void
{
- global $db, $table, $db_is_system_schema, $url_query, $url_params, $cfg, $dbi, $err_url, $err_url_0, $route;
+ global $db, $table, $db_is_system_schema, $url_params, $cfg, $err_url, $err_url_0, $route;
Util::checkParameters(['db', 'table']);
@@ -197,13 +187,6 @@ final class Common
/**
* Set parameters for links
- *
- * @deprecated
- */
- $url_query = Url::getCommon(['db' => $db, 'table' => $table]);
-
- /**
- * Set parameters for links
*/
$url_params = [];
$url_params['db'] = $db;