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

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

Revision: 10313
          http://sourceforge.net/p/xoops/svn/10313
Author:   trabis
Date:     2012-12-03 00:25:57 +0000 (Mon, 03 Dec 2012)
Log Message:
-----------
Removing not needed events and removing cache for front page

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/preloads/core.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops.php

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-12-03 00:04:03 UTC (rev 10312)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/preloads/core.php	2012-12-03 00:25:57 UTC (rev 10313)
@@ -40,12 +40,9 @@
     /**
      * @param array $args
      */
-    static public function eventCoreHeaderEnd($args)
+    static public function eventCoreHeaderCheckcache($args)
     {
         $xoops = Xoops::getInstance();
-        include_once dirname(dirname(__FILE__)) . '/api.php';
-        include_once dirname(dirname(__FILE__)) . '/include/vars.php';
-        include_once dirname(dirname(__FILE__)) . '/include/functions.php';
         xlanguage_select_show(explode('|', $xoops->registry->get('XLANGUAGE_THEME_OPTIONS')));
     }
 }
\ No newline at end of file

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops.php	2012-12-03 00:04:03 UTC (rev 10312)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops.php	2012-12-03 00:25:57 UTC (rev 10313)
@@ -399,9 +399,6 @@
         // for legacy support when template is set after header.
         $this->option['template_main'] = $this->tpl_name;
 
-        // Load xlanguage api
-        $this->preload->triggerEvent('core.language.common');
-
         $xoopsThemeFactory = null;
         $xoopsThemeFactory = new XoopsThemeFactory();
         $xoopsThemeFactory->allowedThemes = $this->getConfig('theme_set_allowed');
@@ -411,9 +408,6 @@
 
         $this->preload->triggerEvent('core.header.addmeta');
 
-        // common preload : xlanguage block, ...
-        $this->preload->triggerEvent('core.header.common');
-
         // Temporary solution for start page redirection
         if (defined("XOOPS_STARTPAGE_REDIRECTED")) {
             $this->theme->headContent(null, "<base href='" . XOOPS_URL . '/modules/' . $this->getConfig('startpage') . "/' />", null, null);
@@ -439,7 +433,7 @@
             // Tricky solution for setting cache time for homepage
         } else {
             if ($this->tpl_name == 'module:system|system_homepage.html') {
-                $this->theme->contentCacheLifetime = 604800;
+                // $this->theme->contentCacheLifetime = 604800;
             }
         }