Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5
This commit is contained in:
commit
85075eba1d
2
README
2
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.
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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
|
||||
*/
|
||||
|
||||
@ -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'])) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user