The branch, QA_3_4 has been updated
via 8b9e7c1279dc1fb73f3b00acf144e0c4e30de463 (commit)
via 246b37937babd4acff40d2ff3075690b8e2c227d (commit)
via 75d1dce908264a0040900fa0ed0080df90749860 (commit)
from 3fa0b1f639b76c8629a0714d0442983d4c9f4030 (commit)
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
libraries/core.lib.php | 12 ++++++++++--
libraries/sanitizing.lib.php | 1 +
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 279d08a..1b61d59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,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 9166dc4..7b85d66 100644
--- a/libraries/core.lib.php
+++ b/libraries/core.lib.php
@@ -260,8 +260,13 @@ function PMA_fatalError($error_message, $message_args = null)
* @access public
*/
function PMA_getPHPDocLink($target) {
- /* l10n: Language to use for PHP documentation, please use only languages which do
exist in official documentation. */
- $lang = _pgettext('PHP documentation language', 'en');
+ /* Gettext does not have to be loaded yet */
+ if (function_exists('_pgettext')) {
+ /* l10n: Language to use for PHP documentation, please use only languages which
do exist in official documentation. */
+ $lang = _pgettext('PHP documentation language', 'en');
+ } else {
+ $lang = 'en';
+ }
return
PMA_linkURL('http://php.net/manual/' . $lang . '/' .
$target);
}
@@ -690,6 +695,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);
diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php
index a65f8ba..f7529e2 100644
--- a/libraries/sanitizing.lib.php
+++ b/libraries/sanitizing.lib.php
@@ -60,6 +60,7 @@ function PMA_sanitize($message, $escape = false, $safe = false)
$valid_links = array(
'http', // default http:// links (and https://)
'./Do', // ./Documentation
+ './ur', // url.php redirector
);
foreach ($founds as $found) {
hooks/post-receive
--
phpMyAdmin