← Back to branch summary

~gregfr/phpdevshell/trunk-modern

« back to all changes in this revision

Viewing changes to includes/PHPDS_core.class.php

  • Committer: greg
  • Date: 2012-06-11 15:39:04 UTC
  • mfrom: (888.1.12 phpdev)
  • Revision ID: greg@silencer-20120611153904-8nypfjiilmexwlvg
post merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
includes/PHPDS_core.class.php
133
133
 
134
134
                try {
135
135
                        ob_start();
136
 
                        $result = $this->core->loadFile($template_dir . $this->core->themeFile, false, true, true, true);
 
136
                        $result = $this->loadFile($template_dir . $this->themeFile, false, true, true, true);
137
137
                        if (false === $result) {
138
 
                                $result = $this->core->loadFile('themes/cloud/' . $this->core->themeFile, false, true, true, true);
 
138
                                $result = $this->loadFile('themes/cloud/' . $this->themeFile, false, true, true, true);
139
139
                        }
140
140
                        if (false === $result) {
141
 
                                throw new PHPDS_exception('Unable to find the custom template "' . $this->core->themeFile . '" in directory "' . $template_dir . '"');
 
141
                                throw new PHPDS_exception('Unable to find the custom template "' . $this->themeFile . '" in directory "' . $template_dir . '"');
142
142
                        }
143
143
                        ob_end_flush();
144
144
                } catch (Exception $e) {