Merge branch 'QA_5_0' into master

Signed-off-by: William Desportes <williamdes@wdes.fr>

ChangeLog

@@ -60,7 +60,6 @@ phpMyAdmin - ChangeLog
 - issue        Added description for the _nopad (NO PAD) collation suffix
 - issue #15404 Remove array/string curly braces access
 - issue #15427 Fixed "FilterLanguages" option does not work (configuration)
-- issue #15127 Fix remove the white square in floating menubar when reloading the designer
 - issue #15202 Fixed creating user with single quote in password results in no password user
 - issue #14950 Fixed left database overview "add column" triggers error
 - issue #15363 Fix remove unexpected quotes on text fields (structure and insert)
@@ -79,6 +78,10 @@ phpMyAdmin - ChangeLog
 - issue        Remove fieldset closing tag when setting global privileges
 - issue #15425 Fix backslash in column name resulting an error in editing
 - issue #15380 Fix Status - Advisor error
+- issue #15439 Fix designer page status not updated when added a new table from another database
+- issue #15440 Fix page number is not being updated in the URL after saving a designer's page
+- issue        Fix reloading a designer's page
+- issue        Fix designer full screen mode button and text stuck when exiting full-screen mode
 
 4.9.0.1 (2019-06-04)
 - issue #14478 phpMyAdmin no longer streams the export data

doc/config.rst

@@ -1878,7 +1878,7 @@ Cookie authentication options
     :default: ``''``
 
     The public key for the reCaptcha service that can be obtained from
-    https://www.google.com/recaptcha/intro/.
+    https://www.google.com/recaptcha/intro/v3.html.
 
     reCaptcha will be then used in :ref:`cookie`.
 
@@ -1888,7 +1888,7 @@ Cookie authentication options
     :default: ``''``
 
     The private key for the reCaptcha service that can be obtain from
-    https://www.google.com/recaptcha/intro/.
+    https://www.google.com/recaptcha/intro/v3.html.
 
     reCaptcha will be then used in :ref:`cookie`.
 

doc/setup.rst

@@ -93,7 +93,7 @@ Installing from Git
 
 In order to install from Git, you'll need a few supporting applications:
 
-* `Git <https://git-scm.com/downloads>`_ to download the source, or you can download the most recent source directly from `Github <https://github.com/phpmyadmin/phpmyadmin/archive/master.zip>`_
+* `Git <https://git-scm.com/downloads>`_ to download the source, or you can download the most recent source directly from `Github <https://codeload.github.com/phpmyadmin/phpmyadmin/zip/master>`_
 * `Composer <https://getcomposer.org/download/>`__
 * `Node.js <https://nodejs.org/en/download/>`_ (version 8 or higher)
 * `Yarn <https://yarnpkg.com/lang/en/docs/install>`_

doc/two_factor.rst

@@ -38,7 +38,7 @@ standards, the most widely used include:
 
 * `FreeOTP for iOS, Android and Pebble <https://freeotp.github.io/>`_
 * `Authy for iOS, Android, Chrome, OS X <https://authy.com/>`_
-* `Google Authenticator for iOS <https://itunes.apple.com/us/app/google-authenticator/id388497605>`_
+* `Google Authenticator for iOS <https://apps.apple.com/us/app/google-authenticator/id388497605>`_
 * `Google Authenticator for Android <https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2>`_
 * `LastPass Authenticator for iOS, Android, OS X, Windows <https://lastpass.com/auth/>`_
 

js/designer/move.js

@@ -518,6 +518,9 @@ DesignerMove.toggleFullscreen = function () {
         valueSent = 'on';
         $content.fullScreen(true);
     } else {
+        $img.attr('src', $img.data('enter'))
+            .attr('title', $span.data('enter'));
+        $span.text($span.data('enter'));
         $content.fullScreen(false);
         valueSent = 'off';
     }
@@ -598,6 +601,7 @@ DesignerMove.addOtherDbTables = function () {
             var dbEncoded = $($newTableDom).find('.small_tab_pref').attr('db_url');
             var tableEncoded = $($newTableDom).find('.small_tab_pref').attr('table_name_url');
             jTabs[dbEncoded + '.' + tableEncoded] = 1;
+            DesignerMove.markUnsaved();
         });
         $(this).dialog('close');
     };
@@ -787,7 +791,7 @@ DesignerMove.submitSaveDialogAndClose = function (callback) {
 };
 
 DesignerMove.save3 = function (callback) {
-    if (parseInt(selectedPage) !== -1) {
+    if (selectedPage !== -1) {
         DesignerMove.save2(callback);
     } else {
         var buttonOptions = {};
@@ -996,7 +1000,7 @@ DesignerMove.saveAs = function () {
                     if (data.id) {
                         selectedPage = data.id;
                     }
-                    $('#page_name').text(name);
+                    DesignerMove.loadPage(selectedPage);
                 }
             }); // end $.post()
         } else {
@@ -1008,7 +1012,7 @@ DesignerMove.saveAs = function () {
                     if (page.pgNr) {
                         selectedPage = page.pgNr;
                     }
-                    $('#page_name').text(page.pageDescr);
+                    DesignerMove.loadPage(selectedPage);
                 });
             } else if (choice === 'new') {
                 DesignerPage.saveToNewPage(db, name, DesignerMove.getUrlPos(), function (page) {
@@ -1017,7 +1021,7 @@ DesignerMove.saveAs = function () {
                     if (page.pgNr) {
                         selectedPage = page.pgNr;
                     }
-                    $('#page_name').text(page.pageDescr);
+                    DesignerMove.loadPage(selectedPage);
                 });
             }
         }
@@ -1059,15 +1063,15 @@ DesignerMove.saveAs = function () {
                     }
                 });
             // select current page by default
-            if (selectedPage !== '-1') {
+            if (selectedPage !== -1) {
                 $('select[name="selected_page"]').val(selectedPage);
             }
         }
     }); // end $.get()
 };
 
 DesignerMove.promptToSaveCurrentPage = function (callback) {
-    if (change === 1 || selectedPage === '-1') {
+    if (change === 1 || selectedPage === -1) {
         var buttonOptions = {};
         buttonOptions[Messages.strYes] = function () {
             $(this).dialog('close');
@@ -2097,7 +2101,7 @@ AJAX.registerOnload('designer/move.js', function () {
         return false;
     });
     $('#reloadPage').on('click', function () {
-        $('#designer_tab').trigger('click');
+        DesignerMove.loadPage(selectedPage);
     });
     $('#angular_direct_button').on('click', function () {
         DesignerMove.angularDirect();

js/navigation.js

@@ -1163,7 +1163,8 @@ Navigation.ResizeHandler = function () {
         var windowWidth = $(window).width();
         $('#pma_navigation').width(pos);
         $('body').css('margin-' + this.left, pos + 'px');
-        $('#pma_console')
+        // Issue #15127
+        $('#floating_menubar, #pma_console')
             .css('margin-' + this.left, (pos + resizerWidth) + 'px');
         $resizer.css(this.left, pos + 'px');
         if (pos === 0) {

libraries/classes/Database/Designer.php

@@ -372,14 +372,14 @@ public function getHtmlForMain(
         $designerConfig->scriptContr = $scriptContr;
         $designerConfig->server = $GLOBALS['server'];
         $designerConfig->scriptDisplayField = $scriptDisplayField;
-        $designerConfig->displayPage = $displayPage;
+        $designerConfig->displayPage = (int) $displayPage;
         $designerConfig->tablesEnabled = $cfgRelation['pdfwork'];
 
         return $this->template->render('database/designer/main', [
             'db' => $db,
             'get_db' => $getDb,
             'designer_config' => json_encode($designerConfig),
-            'display_page' => $displayPage,
+            'display_page' => (int) $displayPage,
             'has_query' => $hasQuery,
             'selected_page' => $selectedPage,
             'params_array' => $paramsArray,

libraries/config.default.php

@@ -2594,7 +2594,7 @@
 /**
  * Specify some parameters for iconv used in character set conversion. See iconv
  * documentation for details:
- * https://www.gnu.org/software/libiconv/documentation/libiconv/iconv_open.3.html
+ * https://www.gnu.org/savannah-checkouts/gnu/libiconv/documentation/libiconv-1.15/iconv_open.3.html
  *
  * @global string $cfg['IconvExtraParams']
  */