Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2013-11-18 13:33:41 +01:00
commit 4cac2cb853

View File

@ -34,8 +34,12 @@ class PMA_GetLinks_Test extends PHPUnit_Framework_TestCase
public function providerLinkURL()
{
return array(
array('http://wiki.phpmyadmin.net', './url.php?url=http%3A%2F%2Fwiki.phpmyadmin.net&server=99&lang=en&token=token'),
array('https://wiki.phpmyadmin.net', './url.php?url=https%3A%2F%2Fwiki.phpmyadmin.net&server=99&lang=en&token=token'),
array('http://wiki.phpmyadmin.net',
'./url.php?url=http%3A%2F%2Fwiki.phpmyadmin.net&server=99'
. '&lang=en&token=token'),
array('https://wiki.phpmyadmin.net',
'./url.php?url=https%3A%2F%2Fwiki.phpmyadmin.net&server=99'
. '&lang=en&token=token'),
array('wiki.phpmyadmin.net', 'wiki.phpmyadmin.net'),
array('index.php?db=phpmyadmin', 'index.php?db=phpmyadmin')
);