[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_7-13-g8170d03

[Marc Delisle]

The branch, QA_3_4 has been updated
       via  8170d03d3cd4892f71db9b89cdf442006bcc1167 (commit)
      from  b94febeb89b208e935b58dc80d2b07446d35d9b0 (commit)


- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

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 e59ea1b..87877da 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 137b83a..530f150 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 41f7c23..7983b9f 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
-- 
phpMyAdmin