diff options
| author | William Desportes <williamdes@wdes.fr> | 2018-11-03 18:06:33 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-03 18:06:33 +0300 |
| commit | d8a319ad17d28625b228cfb411c08dbfbe12593e (patch) | |
| tree | a2b6d19ffb59ae76252fc47fe7dcd41820305c4a /libraries | |
| parent | e2a31d82a2e406ebd5155625191e056f54c33917 (diff) | |
| parent | 04c6c33b56a8cb13f625fb83b16c2f7dbdaa66f9 (diff) | |
Merge pull request #14706 from Gaurav-Punjabi/issue#14965
Removed the default server collation from the footer of databases table in the database page.
Closes: #14965
Signed-off-by: William Desportes <williamdes@wdes.fr>
Diffstat (limited to 'libraries')
| -rw-r--r-- | libraries/classes/Controllers/Server/ServerDatabasesController.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libraries/classes/Controllers/Server/ServerDatabasesController.php b/libraries/classes/Controllers/Server/ServerDatabasesController.php index 6067a587ca..065b1415ae 100644 --- a/libraries/classes/Controllers/Server/ServerDatabasesController.php +++ b/libraries/classes/Controllers/Server/ServerDatabasesController.php @@ -130,7 +130,6 @@ class ServerDatabasesController extends Controller 'is_create_db_priv' => $GLOBALS['is_create_db_priv'], 'dbstats' => $this->_dbstats, 'db_to_create' => $GLOBALS['db_to_create'], - 'server_collation' => $this->dbi->getServerCollation(), 'databases' => isset($databases) ? $databases : null, 'dbi' => $this->dbi, 'disable_is' => $GLOBALS['cfg']['Server']['DisableIS'], @@ -365,7 +364,7 @@ class ServerDatabasesController extends Controller 'disp_name' => __('Collation'), 'description_function' => [Charsets::class, 'getCollationDescr'], 'format' => 'string', - 'footer' => $this->dbi->getServerCollation(), + 'footer' => '', ]; $column_order['SCHEMA_TABLES'] = [ 'disp_name' => __('Tables'), |