Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-08-17 20:16:41 +02:00
commit 02ee1849ab
2 changed files with 6 additions and 5 deletions

View File

@ -145,8 +145,9 @@ class NavigationTest extends PMATestCase
$html
);
$this->assertContains(
'<a href="navigation.php' . URL::getCommon()
. '&unhideNavItem=true&itemType=table&itemName=tableName&dbName=db"'
'<a href="navigation.php?'
. 'unhideNavItem=1&amp;itemType=table&amp;'
. 'itemName=tableName&amp;dbName=db&amp;lang=en"'
. ' class="unhideNavItem ajax">',
$html
);

View File

@ -81,9 +81,9 @@ class NodeDatabaseChildTest extends PMATestCase
$html
);
$this->assertContains(
'<a href="navigation.php' . URL::getCommon()
. '&hideNavItem=true&itemType=itemType&itemName=child'
. '&dbName=parent" class="hideNavItem ajax">',
'<a href="navigation.php?'
. 'hideNavItem=1&amp;itemType=itemType&amp;itemName=child'
. '&amp;dbName=parent&amp;lang=en" class="hideNavItem ajax">',
$html
);
}