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

Conflicts: libraries/config.values.php
2010-07-26 20:24:57 +02:00
parent 8d24baad94 41bc587ed4
commit 7db978de3f
158 changed files with 70698 additions and 65430 deletions
--- a/libraries/header.inc.php
+++ b/libraries/header.inc.php
@@ -157,7 +157,6 @@ if (empty($GLOBALS['is_header_sent'])) {
                /**
                 * Settings for relations stuff
                 */
-                require_once './libraries/relation.lib.php';
                $cfgRelation = PMA_getRelationsParam();

                // Get additional information about tables for tooltip is done