Merge commit '10a6260'

This commit is contained in:
Marc Delisle 2014-01-06 09:37:02 -05:00
commit eedc0f3071

View File

@ -737,7 +737,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
$titles['Browse'] = "'";
$GLOBALS['cfg']['ServerDefault'] = 2;
$result = PMA_getForeignLink(
$column, 'a', 'b', 'd', 2, 0, 1, "<s>", array('tbl', 'db'), 8, $titles
$column, 'a', 'b', 'd', 2, 0, 1, "abc", array('tbl', 'db'), 8, $titles
);
$this->assertTag(
@ -752,8 +752,8 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
'<a class="foreign_values_anchor" target="_blank" onclick='
. '"window.open(this.href,\'foreigners\', \'width=640,height=240,'
. 'scrollbars=yes,resizable=yes\'); return false;" href="browse_'
. 'foreigners.php?db=db&table=tbl&field=f&rownumber=8&server=1'
. '&lang=en&token=token">',
. 'foreigners.php?db=db&table=tbl&field=f&rownumber=8&data=abc'
. '&server=1&lang=en&token=token">',
array('content' => "\\'")
),
$result
@ -761,7 +761,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
$this->assertContains(
'<input type="text" name="fieldsb" class="textfield" d tabindex="2" '
. 'id="field_1_3" value="&lt;s&gt;"',
. 'id="field_1_3" value="abc"',
$result
);