The branch, master has been updated via e96b059dfa66a3a3287405b5e4f9d9e54d9b8e15 (commit) via a9f2c3894282a3c3964a496652617e65d58be3e4 (commit) from 963f478fdd0b2a3cd815b7dc7bbbae2d9a2fa1fd (commit) - Log ----------------------------------------------------------------- commit e96b059dfa66a3a3287405b5e4f9d9e54d9b8e15 Merge: 963f478 a9f2c38 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Sep 29 19:45:48 2011 +0530 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/core.lib.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 035c8e7..425a6be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -66,6 +66,7 @@ phpMyAdmin - ChangeLog - bug #3412862 [relation] Relations/constraints are dropped/created on every change - bug #3390832 [display] Delete records from last page breaks search - bug #3392150 [schema] PMA_User_Schema::processUserChoice() is broken +- bug #3414744 [core] External link fails in 3.4.5 3.4.5.0 (2011-09-14) - bug #3375325 [interface] Page list in navigation frame looks odd diff --git a/libraries/core.lib.php b/libraries/core.lib.php index e519576..56bdad2 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -244,7 +244,7 @@ function PMA_getPHPDocLink($target) /* l10n: Please check that translation actually exists. */ $lang = _pgettext('PHP documentation language', 'en'); - return 'http://php.net/manual/' . $lang . '/' . $target; + return PMA_linkURL('http://php.net/manual/' . $lang . '/' . $target); } /** hooks/post-receive -- phpMyAdmin