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

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

Revision: 10245
          http://sourceforge.net/p/xoops/svn/10245
Author:   dugris
Date:     2012-11-07 00:33:42 +0000 (Wed, 07 Nov 2012)
Log Message:
-----------
fix : preload for xlanguage and common modules

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/class/xlanguage.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/preloads/core.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/xoops_version.php

Added Paths:
-----------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/templates/blocks/index.html

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-11-06 07:25:31 UTC (rev 10244)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php	2012-11-07 00:33:42 UTC (rev 10245)
@@ -411,8 +411,8 @@
 
         $this->preload->triggerEvent('core.header.addmeta');
 
-        // load xlanguage block
-        $this->preload->triggerEvent('core.language.block');
+        // common preload : xlanguage block, ...
+        $this->preload->triggerEvent('core.header.common');
 
         // Temporary solution for start page redirection
         if (defined("XOOPS_STARTPAGE_REDIRECTED")) {

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/class/xlanguage.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/class/xlanguage.php	2012-11-06 07:25:31 UTC (rev 10244)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/class/xlanguage.php	2012-11-07 00:33:42 UTC (rev 10245)
@@ -210,7 +210,7 @@
         global $xoops;
         $xoops->tpl->assign('theme', $xoops->getModuleConfig('theme', 'xlanguage') );
         $xoops->tpl->assign('languages', $this->getAllLanguage(false) );
-        return $xoops->tpl->fetch('db:xlanguage_admin_list.html');
+        return $xoops->tpl->fetch('admin:xlanguage|xlanguage_admin_list.html');
     }
 }
 ?>
\ No newline at end of file

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/preloads/core.php	2012-11-06 07:25:31 UTC (rev 10244)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/preloads/core.php	2012-11-07 00:33:42 UTC (rev 10245)
@@ -36,7 +36,7 @@
         }
     }
 
-    static public function eventCoreLanguageBlock($args)
+    static public function eventCoreHeaderCommon($args)
     {
         include_once dirname(dirname(__FILE__)) . '/include/vars.php';
         include_once dirname(dirname(__FILE__)) . '/include/functions.php';

Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/templates/blocks/index.html
===================================================================
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/xoops_version.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/xoops_version.php	2012-11-06 07:25:31 UTC (rev 10244)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/xoops_version.php	2012-11-07 00:33:42 UTC (rev 10245)
@@ -98,12 +98,6 @@
 $modversion['templates'][$cpt]['file']        = 'blocks/xlanguage_block_bootstrap.html';
 $modversion['templates'][$cpt]['description'] = '';
 
-// Admin templates
-$cpt++;
-$modversion['templates'][$cpt]['file']        = 'xlanguage_admin_list.html';
-$modversion['templates'][$cpt]['description'] = '';
-$modversion['templates'][$cpt]['type']        = 'admin';
-
 // Config
 XoopsLoad::load('xoopslists');