Merge remote branch 'origin/master'

libraries/sqlparser.lib.php

@@ -2092,6 +2092,10 @@ if (! defined('PMA_MINIMUM_COMMON')) {
                 $docu                               = TRUE;
                 break;
         } // end switch
+        // inner_sql is a span that exists for all cases 
+        // of $cfg['SQP']['fmtType'] to make possible a replacement 
+        // for inline editing
+        $str .= '<span class="inner_sql">';
         $close_docu_link = false;
         $indent                                     = 0;
         $bracketlevel                               = 0;
@@ -2578,7 +2582,10 @@ if (! defined('PMA_MINIMUM_COMMON')) {
             $str .= '</a>';
             $close_docu_link = false;
         }
+        // close inner_sql span
+        $str .= '</span>';
         if ($mode=='color') {
+            // close syntax span
             $str .= '</span>';
         }