gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge conflict

Browse Source 
Signed-off-by: Marc Delisle <marc@infomarc.info>
This commit is contained in:
Marc Delisle 2015-12-25 14:34:50 -05:00
commit 4cd3597bda
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -4,6 +4,9 @@ phpMyAdmin - ChangeLog
4.5.4.0 (not yet released)
- issue #11724 live data edit of big sets is not working
4.5.3.1 (2015-12-25)
- issue #11774 Undefined offset 2
4.5.3.0 (2015-12-23)
- issue #11744 Incomplete results of UNION ALL
- issue #11742 MATCH AGAINST keywords not recognized

9
libraries/tbl_common.inc.php
View File

@ -50,9 +50,6 @@ $err_url = PMA_Util::getScriptNameForOption(
* Ensures the database and the table exist (else move to the "parent" script)
* Skip test if we are exporting as we can't tell whether a table name is an alias (which would fail the test).
*/
$URL = explode('/',$_SERVER['REQUEST_URI']);
if ($URL[2])
$requested_function = explode('?',$URL[2])[0];
if (!$URL[2] || $requested_function != 'tbl_export.php')
require_once './libraries/db_table_exists.lib.php';
if (basename($_SERVER['PHP_SELF']) != 'tbl_export.php') {
require_once './libraries/db_table_exists.lib.php';
}