The branch, MAINT_3_4_0 has been updated via 5467dab20909e17fef854fea1e5c626d119c76b7 (commit) from fff3afc08e73b1fedafec2490f343bcb3dd541be (commit)

- Log ----------------------------------------------------------------- commit 5467dab20909e17fef854fea1e5c626d119c76b7 Author: Marc Delisle marc@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