Merge branch 'QA_4_4'

phpmyadmin · May 5, 2015 · bd7cd9a · bd7cd9a
2 parents 93e6af2 + d3338ed
commit bd7cd9a
Show file tree

Hide file tree

Showing 5 changed files with 194 additions and 427 deletions.
diff --git a/libraries/browse_foreigners.lib.php b/libraries/browse_foreigners.lib.php
@@ -215,7 +215,11 @@ function PMA_getHtmlForColumnElement($cssClass, $isSelected, $keyname,
     $description, $title
 ) {
     $keyname = htmlspecialchars($keyname);
-    $output = '<td ' . $cssClass . '>'
+    $output = '<td';
+    if (! empty($cssClass)) {
+        $output .= ' ' . $cssClass;
+    }
+    $output .= '>'
         . ($isSelected ? '<strong>' : '')
         . '<a class="foreign_value" data-key="' . $keyname . '" '
         . 'href="#" title="' . __('Use this value')

diff --git a/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php b/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
@@ -217,79 +217,59 @@ public function testAuth()
 
         // assertions
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<img src="testlogo_right.png" id="imLogo"'
-            ),
+        $this->assertContains(
+            '<img src="testlogo_right.png" id="imLogo"',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<div class="error">'
-            ),
+        $this->assertContains(
+            '<div class="error">',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<form method="post" action="index.php" name="login_form" ' .
-                'class="disableAjax login hide js-show">'
-            ),
+        $this->assertContains(
+            '<form method="post" action="index.php" name="login_form" ' .
+            'class="disableAjax login hide js-show">',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="text" name="pma_servername" id="input_servername" ' .
-                'value="localhost"'
-            ),
+        $this->assertContains(
+            '<input type="text" name="pma_servername" id="input_servername" ' .
+            'value="localhost"',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="text" name="pma_username" id="input_username" ' .
-                'value="pmauser" size="24" class="textfield"/>'
-            ),
+        $this->assertContains(
+            '<input type="text" name="pma_username" id="input_username" ' .
+            'value="pmauser" size="24" class="textfield"/>',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="password" name="pma_password" id="input_password" ' .
-                'value="" size="24" class="textfield" />'
-            ),
+        $this->assertContains(
+            '<input type="password" name="pma_password" id="input_password" ' .
+            'value="" size="24" class="textfield" />',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<select name="server" id="select_server" ' .
-                'onchange="document.forms[\'login_form\'].' .
-                'elements[\'pma_servername\'].value = \'\'" >'
-            ),
+        $this->assertContains(
+            '<select name="server" id="select_server" ' .
+            'onchange="document.forms[\'login_form\'].' .
+            'elements[\'pma_servername\'].value = \'\'" >',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="hidden" name="target" value="testTarget" />'
-            ),
+        $this->assertContains(
+            '<input type="hidden" name="target" value="testTarget" />',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="hidden" name="db" value="testDb" />'
-            ),
+        $this->assertContains(
+            '<input type="hidden" name="db" value="testDb" />',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="hidden" name="table" value="testTable" />'
-            ),
+        $this->assertContains(
+            '<input type="hidden" name="table" value="testTable" />',
             $result
         );
 
@@ -341,33 +321,25 @@ public function testAuth()
 
         // assertions
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<img name="imLogo" id="imLogo" src="testpma_logo.png"'
-            ),
+        $this->assertContains(
+            '<img name="imLogo" id="imLogo" src="testpma_logo.png"',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<select name="lang" class="autosubmit" lang="en" dir="ltr" ' .
-                'id="sel-lang">'
-            ),
+        $this->assertContains(
+            '<select name="lang" class="autosubmit" lang="en" dir="ltr" ' .
+            'id="sel-lang">',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<form method="post" action="index.php" name="login_form" ' .
-                'autocomplete="off" class="disableAjax login hide js-show">'
-            ),
+        $this->assertContains(
+            '<form method="post" action="index.php" name="login_form" ' .
+            'autocomplete="off" class="disableAjax login hide js-show">',
             $result
         );
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<input type="hidden" name="server" value="0" />'
-            ),
+        $this->assertContains(
+            '<input type="hidden" name="server" value="0" />',
             $result
         );
 

diff --git a/test/classes/plugin/auth/PMA_AuthenticationHttp_test.php b/test/classes/plugin/auth/PMA_AuthenticationHttp_test.php
@@ -443,10 +443,8 @@ public function testAuthFails()
         $this->object->authFails();
         $result = ob_get_clean();
 
-        $this->assertTag(
-            PMA_getTagArray(
-                '<p>error 123</p>'
-            ),
+        $this->assertContains(
+            '<p>error 123</p>',
             $result
         );