gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2014-06-24 08:49:14 +02:00
commit 839d183e91
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/Table.class.php
View File

@ -488,8 +488,8 @@ class PMA_Table
}
break;
case 'NULL' :
//If user uncheck null checkbox and not change default value null,
//default value will be ignored.
// If user uncheck null checkbox and not change default value null,
// default value will be ignored.
if ($null !== false && $null != 'NULL') {
break;
}

4
test/classes/PMA_Message_test.php
View File

@ -305,9 +305,9 @@ class PMA_Message_Test extends PHPUnit_Framework_TestCase
public function testSetParams()
{
$this->object->setParams('test&<>');
$this->assertEquals('test&<>', $this->object->getParams());
$this->assertEquals(array('test&<>'), $this->object->getParams());
$this->object->setParams('test&<>', true);
$this->assertEquals('test&amp;&lt;&gt;', $this->object->getParams());
$this->assertEquals(array('test&amp;&lt;&gt;'), $this->object->getParams());
}
/**