[xoops-svn] SF.net SVN: xoops-svn:[12263] XoopsCore/branches/2.5.x/2.5.7/htdocs

[<rgr...@us...>]

Revision: 12263
          http://sourceforge.net/p/xoops/svn/12263
Author:   rgriffith
Date:     2014-01-17 02:55:28 +0000 (Fri, 17 Jan 2014)
Log Message:
-----------
Correct method used to determine the current effective language.

Relates to bug #1220

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/theme.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/include/functions.php

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/theme.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/theme.php	2014-01-16 01:40:42 UTC (rev 12262)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/theme.php	2014-01-17 02:55:28 UTC (rev 12263)
@@ -496,7 +496,7 @@
      */
     function loadLocalization($type = "main")
     {
-        $language = xoops_getConfigOption('language');
+        $language = $GLOBALS['xoopsConfig']['language'];
         // Load global localization stylesheet if available
         if (file_exists($GLOBALS['xoops']->path('language/' . $language . '/style.css'))) {
             $this->addStylesheet($GLOBALS['xoops']->url('language/' . $language . '/style.css'));

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/include/functions.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/include/functions.php	2014-01-16 01:40:42 UTC (rev 12262)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/include/functions.php	2014-01-17 02:55:28 UTC (rev 12263)
@@ -248,7 +248,7 @@
           <script type="text/javascript" src="' . XOOPS_URL . '/include/xoops.js"></script>';
     $themecss = xoops_getcss($xoopsConfig['theme_set']);
     echo '<link rel="stylesheet" type="text/css" media="all" href="' . XOOPS_URL . '/xoops.css" />';
-    $language = xoops_getConfigOption('language');
+    $language = $GLOBALS['xoopsConfig']['language'];
     if (file_exists($GLOBALS['xoops']->path('language/' . $language . '/style.css'))) {
     echo '<link rel="stylesheet" type="text/css" media="all" href="' . XOOPS_URL . '/language/' . $language . '/style.css" />';
     }