The branch, master has been updated via 88c5f90e5395981f704d162d6c383cc2efb82196 (commit) via 8b9e7c1279dc1fb73f3b00acf144e0c4e30de463 (commit) via 246b37937babd4acff40d2ff3075690b8e2c227d (commit) via 75d1dce908264a0040900fa0ed0080df90749860 (commit) from 3535dcfec3274307371f83dba4cc9ea1579b3b78 (commit) - Log ----------------------------------------------------------------- commit 88c5f90e5395981f704d162d6c383cc2efb82196 Merge: 3535dcf 8b9e7c1 Author: Michal Čihař <michal@cihar.com> Date: Tue Oct 18 12:46:24 2011 +0200 Merge branch 'QA_3_4' Conflicts: libraries/core.lib.php libraries/sanitizing.lib.php ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/core.lib.php | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9c2e933..25041cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -60,6 +60,7 @@ phpMyAdmin - ChangeLog - bug #3420229 [doc] Missing documentation section - bug #3423725 [pdf] Broken PDF file when exporting database to PDF - [core] Allow to set language in URL +- bug #3425184 [doc] Fix links to PHP documentation 3.4.6.0 (2011-10-16) - patch #3404173 InnoDB comment display with tooltips/aliases diff --git a/libraries/core.lib.php b/libraries/core.lib.php index 56bdad2..209e4bf 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -241,8 +241,13 @@ function PMA_fatalError($error_message, $message_args = null) */ function PMA_getPHPDocLink($target) { - /* l10n: Please check that translation actually exists. */ - $lang = _pgettext('PHP documentation language', 'en'); + /* Gettext does not have to be loaded yet */ + if (function_exists('_pgettext')) { + /* l10n: Please check that translation actually exists. */ + $lang = _pgettext('PHP documentation language', 'en'); + } else { + $lang = 'en'; + } return PMA_linkURL('http://php.net/manual/' . $lang . '/' . $target); } @@ -688,6 +693,9 @@ function PMA_linkURL($url) if (!preg_match('#^https?://#', $url) || defined('PMA_SETUP')) { return $url; } else { + if (!function_exists('PMA_generate_common_url')) { + require_once('./libraries/url_generating.lib.php'); + } $params = array(); $params['url'] = $url; return './url.php' . PMA_generate_common_url($params); hooks/post-receive -- phpMyAdmin