Merge branch 'QA_4_6'

ChangeLog

@@ -36,6 +36,7 @@ phpMyAdmin - ChangeLog
 - issue #12479 Simplified validation of external links
 - issue #12483 Fix browsing tables with built in transformations
 - issue #12485 Do not show warning about short blowfish_secret if none is set
+- issue #12251 Fixed random logouts due to wrong cookie path
 
 4.6.4 (2016-08-16)
 - issue        [security] Weaknesses with cookie encryption, see PMASA-2016-29

js/get_image.js.php

@@ -17,6 +17,7 @@ if (!defined('TESTSUITE')) {
     // Avoid loading the full common.inc.php because this would add many
     // non-js-compatible stuff like DOCTYPE
     define('PMA_MINIMUM_COMMON', true);
+    define('PMA_PATH_TO_BASEDIR', '../');
     require_once './libraries/common.inc.php';
 }
 

js/get_scripts.js.php

@@ -25,6 +25,7 @@ if (!defined('TESTSUITE')) {
     // Avoid loading the full common.inc.php because this would add many
     // non-js-compatible stuff like DOCTYPE
     define('PMA_MINIMUM_COMMON', true);
+    define('PMA_PATH_TO_BASEDIR', '../');
     require_once './libraries/common.inc.php';
 }
 

js/whitelist.php

@@ -19,6 +19,7 @@ if (!defined('TESTSUITE')) {
     // Avoid loading the full common.inc.php because this would add many
     // non-js-compatible stuff like DOCTYPE
     define('PMA_MINIMUM_COMMON', true);
+    define('PMA_PATH_TO_BASEDIR', '../');
     require_once './libraries/common.inc.php';
     // Close session early as we won't write anything there
     session_write_close();