From 8170d03d3cd4892f71db9b89cdf442006bcc1167 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sat, 5 Nov 2011 09:57:28 -0400 Subject: [PATCH] Patch by Robert Scheck for phpMyAdmin >= 3.4.7, which makes the php-gettext library that is used configurable, which is helpful or even required for some vendors or downstreams. The default is the internal library to keep backward compatibility. More details can be found at SourceForge: https://sourceforge.net/tracker/?func=detail&aid=3433770&group_id=23067&atid=377410 --- ChangeLog | 1 + libraries/select_lang.lib.php | 2 +- libraries/vendor_config.php | 6 ++++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e59ea1b26..87877da26 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ phpMyAdmin - ChangeLog - bug #3428627 [import] ODS import ignores memory limits - bug #3426836 [interface] Visual column separation - bug #3428065 [parser] TRUE not recognized by parser ++ patch #3433770 [config] Make location of php-gettext configurable 3.4.7.0 (2011-10-23) - bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index 137b83a65..530f1506d 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -373,7 +373,7 @@ $GLOBALS['lang_path'] = './locale/'; /** * Load gettext functions. */ -require './libraries/php-gettext/gettext.inc'; +require GETTEXT_INC; /** * @global string interface language diff --git a/libraries/vendor_config.php b/libraries/vendor_config.php index 41f7c233f..7983b9fc2 100644 --- a/libraries/vendor_config.php +++ b/libraries/vendor_config.php @@ -59,4 +59,10 @@ define('CUSTOM_FOOTER_FILE', CONFIG_DIR . 'config.footer.inc.php'); * Default value for check for version upgrades. */ define('VERSION_CHECK_DEFAULT', true); + +/** + * Path to gettext.inc file. Useful when you want php-gettext somewhere else, + * eg. /usr/share/php/gettext/gettext.inc. + */ +define('GETTEXT_INC', './libraries/php-gettext/gettext.inc'); ?>