Changeset 1280:d9627cb1cb02 for inc/public/class.dc.template.php

Timestamp:

08/06/13 10:03:57 (12 years ago)

Author:

Dsls

Branch:

default

Message:

Backed out merge changeset: 48c827f9db99

Backed out merge revision to its first parent (5ceeeb6f5454)

File:

• inc/public/class.dc.template.php (modified) (3 diffs)

inc/public/class.dc.template.php

@@ -67 +67 @@
           $this->addValue('BlogLanguage',array($this,'BlogLanguage'));
           $this->addValue('BlogThemeURL',array($this,'BlogThemeURL'));
-          $this->addValue('BlogParentThemeURL',array($this,'BlogParentThemeURL'));
           $this->addValue('BlogUpdateDate',array($this,'BlogUpdateDate'));
           $this->addValue('BlogID',array($this,'BlogID'));
@@ -840 +839 @@
      
      /*dtd
-     <!ELEMENT tpl:BlogThemeURL - O -- Blog's current Theme URL -->
+     <!ELEMENT tpl:BlogThemeURL - O -- Blog's current Themei URL -->
      */
      public function BlogThemeURL($attr)
@@ -846 +845 @@
           $f = $this->getFilters($attr);
           return '<?php echo '.sprintf($f,'$core->blog->settings->system->themes_url."/".$core->blog->settings->system->theme').'; ?>';
-     }
-     
-     /*dtd
-     <!ELEMENT tpl:BlogParentThemeURL - O -- Blog's current Theme's parent URL -->
-     */
-     public function BlogParentThemeURL($attr)
-     {
-          $f = $this->getFilters($attr);
-          $parent = '$core->themes->moduleInfo($core->blog->settings->system->theme,\'parent\')';
-          return '<?php echo '.sprintf($f,'$core->blog->settings->system->themes_url."/".('."$parent".' ? '."$parent".' : $core->blog->settings->system->theme)').'; ?>';
      }