Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

Conflicts: server_export.php
2010-07-26 13:42:42 -07:00
parent 723a71c014 41bc587ed4
commit 2a59451ac5
164 changed files with 70695 additions and 65467 deletions
--- a/server_export.php
+++ b/server_export.php
@@ -10,7 +10,6 @@
 */
 require_once './libraries/common.inc.php';

-$GLOBALS['js_include'][] = 'functions.js';
 $GLOBALS['js_include'][] = 'export.js';

 /**
@@ -50,5 +49,5 @@ require_once './libraries/display_export.lib.php';
 /**
 * Displays the footer
 */
-require_once './libraries/footer.inc.php';
+require './libraries/footer.inc.php';
 ?>