Merge branch 'QA_4_7'

ChangeLog

@@ -64,6 +64,10 @@ phpMyAdmin - ChangeLog
 - issue #12966 After adding a column ADD INDEX option won't be displayed when enabling AI
 - issue #12972 Better error message when Composer has not been run
 - issue #12988 Do not show language selector without choices
+- issue #12993 Fixed external links to php documentation
+- issue #12990 Fixed error when loading favorite tables to console
+- issue #12981 Improved rendering of new version information
+- issue #12922 Fixed bookmarks ordering
 
 4.6.6 (2017-01-23)
 - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup'

js/functions.js

@@ -528,7 +528,7 @@ function PMA_current_version(data)
         version_information_message_link.className = 'disableAjax';
         version_information_message_link_text = document.createTextNode(data.version);
         version_information_message_link.appendChild(version_information_message_link_text);
-        var prefix_message = document.createTextNode(PMA_messages.strLatestAvailable);
+        var prefix_message = document.createTextNode(PMA_messages.strLatestAvailable + ' ');
         version_information_message.appendChild(prefix_message);
         version_information_message.appendChild(version_information_message_link);
         if (latest > current) {
@@ -557,6 +557,9 @@ function PMA_current_version(data)
         if (latest === current) {
             version_information_message = document.createTextNode(' (' + PMA_messages.strUpToDate + ')');
         }
+        /* Remove extra whitespace */
+        var version_info = $('#li_pma_version').contents().get(2);
+        version_info.textContent = $.trim(version_info.textContent);
         var $liPmaVersion = $('#li_pma_version');
         $liPmaVersion.find('span.latest').remove();
         $liPmaVersion.append($(version_information_message));
@@ -4193,6 +4196,7 @@ AJAX.registerOnload('functions.js', function () {
                 favorite_tables: (isStorageSupported('localStorage') && typeof window.localStorage.favorite_tables !== 'undefined')
                     ? window.localStorage.favorite_tables
                     : '',
+                token: PMA_commonParams.get('token'),
                 no_debug: true
             },
             success: function (data) {

libraries/Bookmark.php

@@ -277,7 +277,7 @@ class Bookmark
         if ($db !== false) {
             $query .= " AND dbase = '" . $GLOBALS['dbi']->escapeString($db) . "'";
         }
-        $query .= " ORDER BY label";
+        $query .= " ORDER BY label ASC";
 
         $result = $GLOBALS['dbi']->fetchResult(
             $query,

libraries/core.lib.php

@@ -741,6 +741,7 @@ function PMA_isAllowedDomain($url)
         'mariadb.org', 'mariadb.com',
         /* php.net domains */
         'php.net',
+        'secure.php.net',
         /* sourceforge.net domain */
         'sourceforge.net',
         /* Github domains*/

libraries/operations.lib.php

@@ -1714,6 +1714,8 @@ function PMA_getQueryAndResultForReorderingTable()
         && $_REQUEST['order_order'] === 'desc'
     ) {
         $sql_query .= ' DESC';
+    } else {
+        $sql_query .= ' ASC';
     }
     $sql_query .= ';';
     $result = $GLOBALS['dbi']->query($sql_query);