Changeset 879 for trunk/include/common.inc.php

Timestamp:

Sep 27, 2005, 11:57:14 PM (19 years ago)

Author:

plg

Message:

• bug 168 fixed: crash when language file does not exists. Constant PHPWG_DEFAULT_LANGUAGE added. New function get_language_filepath always used to find language files.

File:

• trunk/include/common.inc.php (modified) (1 diff)

trunk/include/common.inc.php

@@ -167 +167 @@
 
 // language files
-$user_langdir = PHPWG_ROOT_PATH.'language/'.$user['language'];
-$conf_langdir = PHPWG_ROOT_PATH.'language/'.$conf['default_language'];
+include_once(get_language_filepath('common.lang.php'));
 
-if (file_exists($user_langdir.'/common.lang.php'))
-{
-  include_once($user_langdir.'/common.lang.php');
-}
-else
-{
-  include_once($conf_langdir.'/common.lang.php');
-}
-
-// The administration section requires 2 more language files
 if (defined('IN_ADMIN') and IN_ADMIN)
 {
-  foreach (array('admin') as $section)
-  {
-    if (file_exists($user_langdir.'/'.$section.'.lang.php'))
-    {
-      include_once($user_langdir.'/'.$section.'.lang.php');
-    }
-    else
-    {
-      include_once($conf_langdir.'/'.$section.'.lang.php');
-    }
-  }
+  include_once(get_language_filepath('admin.lang.php'));
 }