Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3

ChangeLog

@@ -10,6 +10,7 @@ phpMyAdmin - ChangeLog
 - bug #4681 'Central columns table' field in setup does not have a description
 - bug #4318 Default connection collation and sorting
 - bug #4683 Relational data is not properly updated on table rename
+- bug #4655 Undefined index: collation_connection (second patch)
 
          --- Older ChangeLogs can be found on our project website ---
                      http://www.phpmyadmin.net/old-stuff/ChangeLogs/

libraries/Header.class.php

@@ -220,6 +220,12 @@ class PMA_Header
         $table = ! empty($GLOBALS['table']) ? $GLOBALS['table'] : '';
         $pftext = ! empty($_SESSION['tmpval']['pftext'])
             ? $_SESSION['tmpval']['pftext'] : '';
+
+        // not sure when this happens, but it happens
+        if (! isset($GLOBALS['collation_connection'])) {
+            $GLOBALS['collation_connection'] = 'utf8_general_ci';
+        }
+
         return array(
             'common_query' => PMA_URL_getCommon(array(), 'text'),
             'opendb_url' => $GLOBALS['cfg']['DefaultTabDatabase'],