Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

index.php

@@ -522,11 +522,11 @@ if ($server > 0) {
             . '%sFind out why%s. '
         );
         if ($cfg['ZeroConf'] == true) {
-            $msg_text .= __(
-                '<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'
-                . 'Or alternately go to \'Operations\' tab of any database '
-                . 'to set it up there.'
-            );
+            $msg_text .= '<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' .
+                __(
+                    'Or alternately go to \'Operations\' tab of any database '
+                    . 'to set it up there.'
+                );
         }
         $msg = PMA_Message::notice($msg_text);
         $msg->addParam(

js/sql.js

@@ -536,6 +536,7 @@ AJAX.registerOnload('sql.js', function () {
         var submitData = $form.serialize() + '&ajax_request=true&ajax_page_request=true&submit_mult=' + $button.val();
         PMA_ajaxShowMessage();
         $.get($form.attr('action'), submitData, AJAX.responseHandler);
+    });
 }); // end $()
 
 /**