[xoops-svn] SF.net SVN: xoops-svn:[10377] XoopsCore/branches/2.6.x/2.6.0/htdocs/ xoops_lib/Xoops.php

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

Revision: 10377
          http://sourceforge.net/p/xoops/svn/10377
Author:   trabis
Date:     2012-12-13 00:55:46 +0000 (Thu, 13 Dec 2012)
Log Message:
-----------
Adding legacy support for XoopsOption template_main

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops.php

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-13 00:35:57 UTC (rev 10376)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops.php	2012-12-13 00:55:46 UTC (rev 10377)
@@ -459,6 +459,12 @@
         $included = true;
 
         $this->preload()->triggerEvent('core.header.start');
+
+        //For legacy
+        if (!$tpl_name && isset($this->option['template_main'])) {
+            $tpl_name = $this->option['template_main'];
+            $this->deprecated('XoopsOption \'template_main\' is deprecated, please use $xoops->header(\'templatename.html\') instead');
+        }
         $this->theme($tpl_name);
 
         if ($this->isAdminSide) {