From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/sites/database_list.php | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/interface/web/sites/database_list.php b/interface/web/sites/database_list.php
index 9ced595..dd0241f 100644
--- a/interface/web/sites/database_list.php
+++ b/interface/web/sites/database_list.php
@@ -28,8 +28,8 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-require_once('../../lib/config.inc.php');
-require_once('../../lib/app.inc.php');
+require_once '../../lib/config.inc.php';
+require_once '../../lib/app.inc.php';
/******************************************
* Begin Form configuration
@@ -48,26 +48,27 @@
class list_action extends listform_actions {
-
+
function onShow() {
- global $app,$conf;
-
+ global $app, $conf;
+
$app->uses('getconf');
$global_config = $app->getconf->get_global_config('sites');
-
+
if($global_config['dblist_phpmyadmin_link'] == 'y') {
- $app->tpl->setVar('dblist_phpmyadmin_link',1);
+ $app->tpl->setVar('dblist_phpmyadmin_link', 1);
} else {
- $app->tpl->setVar('dblist_phpmyadmin_link',0);
+ $app->tpl->setVar('dblist_phpmyadmin_link', 0);
}
-
+
parent::onShow();
}
-
+
}
$list = new list_action;
+$list->SQLOrderBy = 'ORDER BY web_database.database_name';
$list->onLoad();
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1