The branch, master has been updated via 02d57998932e21bd4b8189e52aa9430089edbbcf (commit) via 8170d03d3cd4892f71db9b89cdf442006bcc1167 (commit) from e27befbdcc4e27c90c64ee398315a37f4be8df73 (commit)
- Log ----------------------------------------------------------------- commit 02d57998932e21bd4b8189e52aa9430089edbbcf Merge: e27befb 8170d03 Author: Marc Delisle marc@infomarc.info Date: Sat Nov 5 10:00:50 2011 -0400
Fix merge conflicts
-----------------------------------------------------------------------
Summary of changes: ChangeLog | 1 + libraries/select_lang.lib.php | 2 +- libraries/vendor_config.php | 6 ++++++ 3 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog index 2eb1eb0..b622fc9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -64,6 +64,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 b8bb5f9..087639b 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -365,7 +365,7 @@ $GLOBALS['lang_path'] = './locale/'; /** * Load gettext functions. */ -require_once './libraries/php-gettext/gettext.inc'; +require_once GETTEXT_INC;
/** * @global string interface language diff --git a/libraries/vendor_config.php b/libraries/vendor_config.php index ed2b410..d24b5ce 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'); ?>
hooks/post-receive
-
Marc Delisle