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

ChangeLog

@@ -11,6 +11,7 @@ phpMyAdmin - ChangeLog
 - bug       In /setup, PMA_messages is not defined
 - bug #4924 Recaptcha failure
 - bug #4930 Database copy doesn't work for tables with more than one FULLTEXT index
+- bug #4929 Edit view structure doesn't load the algorithm
 
 4.4.7.0 (2015-05-16)
 - bug #4876 Settings issues (Favorite tables shown twice in Settings)

libraries/structure.lib.php

@@ -1577,6 +1577,12 @@ function PMA_getHtmlForEditView($url_params)
         . " AND TABLE_NAME='" . PMA_Util::sqlAddSlashes($GLOBALS['table']) . "';";
     $item = $GLOBALS['dbi']->fetchSingleRow($query);
 
+    $query = "SHOW CREATE TABLE " . PMA_Util::backquote($GLOBALS['db'])
+        . "." . PMA_Util::backquote($GLOBALS['table']);
+    $createView = $GLOBALS['dbi']->fetchValue($query, 0, 'Create View');
+    // get algorithm from $createView of the form CREATE ALGORITHM=<ALGORITHM> DE...
+    $item['ALGORITHM'] = explode(" ", substr($createView, 17))[0];
+
     $view = array(
         'operation' => 'alter',
         'definer' => $item['DEFINER'],
@@ -1584,6 +1590,7 @@ function PMA_getHtmlForEditView($url_params)
         'name' => $GLOBALS['table'],
         'as' => $item['VIEW_DEFINITION'],
         'with' => $item['CHECK_OPTION'],
+        'algorithm' => $item['ALGORITHM'],
     );
     $url  = 'view_create.php' . PMA_URL_getCommon($url_params) . '&amp;';
     $url .= implode(