xoops-svn

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

[<du...@us...>]

Revision: 10198
          http://sourceforge.net/p/xoops/svn/10198
Author:   dugris
Date:     2012-10-07 11:43:12 +0000 (Sun, 07 Oct 2012)
Log Message:
-----------
fix template system_dummy.html

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.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	2012-10-07 11:37:49 UTC (rev 10197)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php	2012-10-07 11:43:12 UTC (rev 10198)
@@ -391,7 +391,7 @@
             $tpl_info = $this->getTplInfo($tpl_name);
             $this->tpl_name = $tpl_info['tpl_name'];
         } else {
-            $tpl_name = 'system_dummy.html';
+            $tpl_name = 'module:system|system_dummy.html';
             $tpl_info = $this->getTplInfo($tpl_name);
             $this->tpl_name = $tpl_info['tpl_name'];
         }

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

[<du...@us...>]

Revision: 10199
          http://sourceforge.net/p/xoops/svn/10199
Author:   dugris
Date:     2012-10-07 23:01:26 +0000 (Sun, 07 Oct 2012)
Log Message:
-----------
Fix to get config Preferences / System : Module Config Options

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.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	2012-10-07 11:43:12 UTC (rev 10198)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php	2012-10-07 23:01:26 UTC (rev 10199)
@@ -1501,15 +1501,16 @@
     /**
      * @param string $key
      * @param string $type
+     * @param int $module
      *
      * @return mixed
      */
-    public function getConfig($key, $type = 'XOOPS_CONF')
+    public function getConfig($key, $type = 'XOOPS_CONF', $module = 0)
     {
         if (isset($this->_systemConfigs[$key])) {
             return $this->_systemConfigs[$key];
         }
-        $this->getConfigs($type);
+        $this->getConfigs($type, $module);
         if (!isset($this->_systemConfigs[$key])) {
             $this->_systemConfigs[$key] = '';
         }
@@ -1518,13 +1519,14 @@
 
     /**
      * @param string $type
+     * @param int $module
      *
      * @return array
      */
-    public function getConfigs($type = 'XOOPS_CONF')
+    public function getConfigs($type = 'XOOPS_CONF', $module = 0)
     {
         $configs = $this->getHandlerConfig()
-                ->getConfigsByCat((is_array($type)) ? $type : (!defined($type) ? $type : constant($type)));
+                ->getConfigsByCat((is_array($type)) ? $type : (!defined($type) ? $type : constant($type)), $module);
         $this->_systemConfigs = array_merge($this->_systemConfigs, $configs);
         $this->config =& $this->_systemConfigs; //for compatibilty
         return $this->_systemConfigs;