upgrade to codeigniter 1.7.2 for f12

[www-register-wizard.git] / libraries / Language.php

diff --git a/libraries/Language.php b/libraries/Language.php
index 621e217..b679c89 100644 (file)
--- a/libraries/Language.php
+++ b/libraries/Language.php
@@ -6,7 +6,7 @@
  *
  * @package            CodeIgniter
  * @author             ExpressionEngine Dev Team
- * @copyright  Copyright (c) 2008, EllisLab, Inc.
+ * @copyright  Copyright (c) 2008 - 2009, EllisLab, Inc.
  * @license            http://codeigniter.com/user_guide/license.html
  * @link               http://codeigniter.com
  * @since              Version 1.0
@@ -33,77 +33,76 @@ class CI_Language {
         * Constructor
         *
         * @access      public
-        */     
+        */
        function CI_Language()
        {
                log_message('debug', "Language Class Initialized");
        }
-       
+
        // --------------------------------------------------------------------
-       
+
        /**
         * Load a language file
         *
         * @access      public
         * @param       mixed   the name of the language file to be loaded. Can be an array
         * @param       string  the language (english, etc.)
-        * @return      void
+        * @return      mixed
         */
        function load($langfile = '', $idiom = '', $return = FALSE)
-       {       
+       {
                $langfile = str_replace(EXT, '', str_replace('_lang.', '', $langfile)).'_lang'.EXT;
-               
+
                if (in_array($langfile, $this->is_loaded, TRUE))
                {
                        return;
                }
-               
+
                if ($idiom == '')
                {
                        $CI =& get_instance();
                        $deft_lang = $CI->config->item('language');
                        $idiom = ($deft_lang == '') ? 'english' : $deft_lang;
                }
-       
+
                // Determine where the language file is and load it
                if (file_exists(APPPATH.'language/'.$idiom.'/'.$langfile))
                {
                        include(APPPATH.'language/'.$idiom.'/'.$langfile);
                }
                else
-               {               
+               {
                        if (file_exists(BASEPATH.'language/'.$idiom.'/'.$langfile))
                        {
                                include(BASEPATH.'language/'.$idiom.'/'.$langfile);
                        }
                        else
                        {
-                               show_error('Unable to load the requested language file: language/'.$langfile);
+                               show_error('Unable to load the requested language file: language/'.$idiom.'/'.$langfile);
                        }
                }
 
-               
                if ( ! isset($lang))
                {
                        log_message('error', 'Language file contains no data: language/'.$idiom.'/'.$langfile);
                        return;
                }
-               
+
                if ($return == TRUE)
                {
                        return $lang;
                }
-               
+
                $this->is_loaded[] = $langfile;
                $this->language = array_merge($this->language, $lang);
                unset($lang);
-               
+
                log_message('debug', 'Language file loaded: language/'.$idiom.'/'.$langfile);
                return TRUE;
        }
-       
+
        // --------------------------------------------------------------------
-       
+
        /**
         * Fetch a single line of text from the language array
         *