[xoops-svn] SF.net SVN: xoops:[8034] XoopsCore/branches/2.6.x/2.6.0/htdocs

[<tr...@us...>]

Revision: 8034
          http://xoops.svn.sourceforge.net/xoops/?rev=8034&view=rev
Author:   trabis
Date:     2011-11-03 00:39:43 +0000 (Thu, 03 Nov 2011)
Log Message:
-----------
Small refactoring...

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/include/functions.php

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php	2011-11-03 00:35:31 UTC (rev 8033)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php	2011-11-03 00:39:43 UTC (rev 8034)
@@ -726,7 +726,7 @@
     /**
      * XOOPS language loader wrapper
      *
-     * Temporay solution, not encouraged to use
+     * Temporary solution, not encouraged to use
      *
      * @param   string  $name       Name of language file to be loaded, without extension
      * @param   string  $domain     Module dirname; global language file will be loaded if $domain is set to 'global' or not specified
@@ -740,7 +740,7 @@
         if (empty($name)) {
             return false;
         }
-        $language = empty($language) ? $this->config['language'] : $language;
+        $language = empty($language) ? $this->getConfig('language') : $language;
         $path = ((empty($domain) || 'global' == $domain) ? '' : "modules/{$domain}/") . 'language';
         if (!file_exists($file = $this->path("{$path}/{$language}/{$name}.php"))) {
             if (!file_exists($file = $this->path("{$path}/english/{$name}.php"))) {
@@ -1519,10 +1519,9 @@
      * function to update compiled template file in cache folder
      *
      * @param string $tpl_id
-     * @param boolean $clear_old
      * @return boolean
      */
-    public function templateTouch($tpl_id, $clear_old = true)
+    public function templateTouch($tpl_id)
     {
         $tplfile = $this->getHandlerTplfile()->get($tpl_id);
 

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/include/functions.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/include/functions.php	2011-11-03 00:35:31 UTC (rev 8033)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/functions.php	2011-11-03 00:39:43 UTC (rev 8034)
@@ -541,7 +541,7 @@
 {
     $xoops = Xoops::getInstance();
     $xoops->logger->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
-    return $xoops->templateTouch($tpl_id, $clear_old);
+    return $xoops->templateTouch($tpl_id);
 }
 
 /**

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.