Patch by Robert Scheck <robert@fedoraproject.org>

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
This commit is contained in:
Robert Scheck
2011-11-05 09:57:28 -04:00
committed by Marc Delisle
parent b94febeb89
commit 8170d03d3c
3 changed files with 8 additions and 1 deletions

View File

@@ -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

View File

@@ -373,7 +373,7 @@ $GLOBALS['lang_path'] = './locale/';
/**
* Load gettext functions.
*/
require './libraries/php-gettext/gettext.inc';
require GETTEXT_INC;
/**
* @global string interface language

View File

@@ -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');
?>