From 45c26d3e9d4f0330b84cf06d866ec7318de9210b Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 26 Aug 2015 06:10:53 -0400 Subject: [PATCH 1/2] 4.5.0-beta1 release Signed-off-by: Marc Delisle --- README | 2 +- doc/conf.py | 2 +- libraries/Config.class.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README b/README index 297c7c2acf..1b9f266b62 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.5.0-dev +Version 4.5.0-beta1 A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index b6b5536304..6698b60166 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -51,7 +51,7 @@ copyright = u'2012 - 2014, The phpMyAdmin devel team' # built documents. # # The short X.Y version. -version = '4.5.0-dev' +version = '4.5.0-beta1' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 626c54e63f..1942324650 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -114,7 +114,7 @@ class PMA_Config */ public function checkSystem() { - $this->set('PMA_VERSION', '4.5.0-dev'); + $this->set('PMA_VERSION', '4.5.0-beta1'); /** * @deprecated */ From d8d02fabc9e4878e995a250d66d91d9ecd6a6af4 Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Wed, 26 Aug 2015 17:54:24 +0530 Subject: [PATCH 2/2] Remove not required lines Signed-off-by: Atul Pratap Singh --- libraries/controllers/TableSearchController.class.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libraries/controllers/TableSearchController.class.php b/libraries/controllers/TableSearchController.class.php index fcd9411453..6a05c33c96 100644 --- a/libraries/controllers/TableSearchController.class.php +++ b/libraries/controllers/TableSearchController.class.php @@ -171,10 +171,6 @@ class TableSearchController extends TableController */ public function indexAction() { - $_REQUEST['db'] = 'TEST'; - $_REQUEST['table'] = 'fuck2'; - $_REQUEST['where_clause'] = '`c` = 2'; - $this->getDataRowAction(); switch ($this->_searchType) { case 'replace': if (isset($_POST['find'])) {