From 9bab8c6db9d93383e42c50a4a76de0d1767d1e21 Mon Sep 17 00:00:00 2001 From: e107steved Date: Sun, 13 Jan 2008 12:34:40 +0000 Subject: [PATCH] Remove 0.6xx method of looking for language files --- e107_files/shortcode/menu.sc | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/e107_files/shortcode/menu.sc b/e107_files/shortcode/menu.sc index 8936cbfca..2d6a32181 100644 --- a/e107_files/shortcode/menu.sc +++ b/e107_files/shortcode/menu.sc @@ -1,4 +1,4 @@ -/* $Id: menu.sc,v 1.2 2007-05-11 19:57:55 e107steved Exp $ */ +/* $Id: menu.sc,v 1.3 2008-01-13 12:34:40 e107steved Exp $ */ global $sql; global $ns; global $eMenuList; @@ -82,17 +82,20 @@ foreach($eMenuList[$tmp[0]] as $row) } else { - if(is_readable(e_LANGUAGEDIR.e_LANGUAGE."/plugins/lan_{$row['menu_path']}.php")) { - include_once(e_LANGUAGEDIR.e_LANGUAGE."/plugins/lan_{$row['menu_path']}.php"); - } elseif (is_readable(e_PLUGIN.$row['menu_path']."/languages/".e_LANGUAGE.".php")) { + if (is_readable(e_PLUGIN.$row['menu_path']."/languages/".e_LANGUAGE.".php")) + { include_once(e_PLUGIN.$row['menu_path']."/languages/".e_LANGUAGE.".php"); - } elseif (is_readable(e_PLUGIN.$row['menu_path']."/languages/".e_LANGUAGE."/".e_LANGUAGE.".php")) { + } + elseif (is_readable(e_PLUGIN.$row['menu_path']."/languages/".e_LANGUAGE."/".e_LANGUAGE.".php")) + { include_once(e_PLUGIN.$row['menu_path']."/languages/".e_LANGUAGE."/".e_LANGUAGE.".php"); - } elseif (is_readable(e_LANGUAGEDIR."english/plugins/lan_{$row['menu_path']}.php")) { - include_once(e_LANGUAGEDIR."English/plugins/lan_{$row['menu_path']}.php"); - } elseif (is_readable(e_PLUGIN.$row['menu_path']."/languages/English.php")) { + } + elseif (is_readable(e_PLUGIN.$row['menu_path']."/languages/English.php")) + { include_once(e_PLUGIN.$row['menu_path']."/languages/English.php"); - } elseif (is_readable(e_PLUGIN.$row['menu_path']."/languages/English/English.php")) { + } + elseif (is_readable(e_PLUGIN.$row['menu_path']."/languages/English/English.php")) + { include_once(e_PLUGIN.$row['menu_path']."/languages/English/English.php"); }