[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_0ALPHA1-549-g36337ff

[Marc Delisle]

The branch, QA_3_4 has been updated
       via  36337ff8deec0271ea98d9e5495ddc753cbbe4b7 (commit)
      from  412377ca52f56675db13d3bd1627ae82dc1d02e7 (commit)


- Log -----------------------------------------------------------------
commit 36337ff8deec0271ea98d9e5495ddc753cbbe4b7
Author: Marc Delisle <marc at infomarc.info>
Date:   Sun Nov 28 07:40:29 2010 -0500

    bug #3119884, path not found (in case the kit is English-only)

-----------------------------------------------------------------------

Summary of changes:
 libraries/select_lang.lib.php |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php
index f1a3725..3ed35e4 100644
--- a/libraries/select_lang.lib.php
+++ b/libraries/select_lang.lib.php
@@ -343,10 +343,8 @@ function PMA_langList()
 
     /* Open the directory */
     $handle = @opendir($GLOBALS['lang_path']);
+    /* This can happen if the kit is English-only */
     if ($handle === FALSE) {
-        trigger_error('phpMyAdmin: path not found: '
-            . $GLOBALS['lang_path'] . ', check your language directory.',
-            E_USER_WARNING);
         return $result;
     }
 
@@ -363,7 +361,7 @@ function PMA_langList()
 }
 
 /**
- * @global string  path to the translations directory
+ * @global string  path to the translations directory; may be absent if the kit is English-only
  */
 $GLOBALS['lang_path'] = './locale/';
 


hooks/post-receive
-- 
phpMyAdmin