Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-10-18 12:17:32 +02:00
commit c7bc718511
2 changed files with 2 additions and 2 deletions

View File

@ -43,7 +43,7 @@ class PMA_ShowPHPDocu_Test extends PHPUnit_Framework_TestCase
{
$target = "docu";
$lang = _pgettext('PHP documentation language', 'en');
$expected = '<a href="./url.php?url=https%3A%2F%2Fphp.net%2Fmanual%2F' . $lang
$expected = '<a href="./url.php?url=https%3A%2F%2Fsecure.php.net%2Fmanual%2F' . $lang
. '%2F' . $target . '" target="documentation">'
. '<img src="themes/dot.gif" title="' . __('Documentation') . '" alt="'
. __('Documentation') . '" class="icon ic_b_help" /></a>';

View File

@ -33,7 +33,7 @@ class PMA_GetLinks_Test extends PHPUnit_Framework_TestCase
$lang = _pgettext('PHP documentation language', 'en');
$this->assertEquals(
PMA_getPHPDocLink('function'),
'./url.php?url=https%3A%2F%2Fphp.net%2Fmanual%2F'
'./url.php?url=https%3A%2F%2Fsecure.php.net%2Fmanual%2F'
. $lang . '%2Ffunction'
);
}