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

This commit is contained in:
Madhura Jayaratne 2015-06-24 07:42:42 +05:30
commit da49e8fe71
2 changed files with 3 additions and 3 deletions

View File

@ -230,11 +230,11 @@ function PMA_displayInput($path, $name, $type, $value, $description = '',
switch ($type) {
case 'text':
$htmlOutput .= '<input type="text" size="60" ' . $name_id . $field_class
$htmlOutput .= '<input type="text" size="40" ' . $name_id . $field_class
. ' value="' . htmlspecialchars($value) . '" />';
break;
case 'password':
$htmlOutput .= '<input type="password" size="60" ' . $name_id . $field_class
$htmlOutput .= '<input type="password" size="40" ' . $name_id . $field_class
. ' value="' . htmlspecialchars($value) . '" />';
break;
case 'short_text':

View File

@ -200,7 +200,7 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
);
$this->assertContains(
'<input type="text" size="60" name="test/path" id="test/path" ' .
'<input type="text" size="40" name="test/path" id="test/path" ' .
'class="custom field-error" value="val" />',
$result
);