From e8ee839e463049d32e17294433769e052f2833a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=85kre=20Solberg?= <andreas.solberg@uninett.no>
Date: Fri, 18 Apr 2008 14:28:07 +0000
Subject: [PATCH] Allowing overriding headers and footers
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@499 44740490-163a-0410-bde0-09ae8108e29a
---
lib/SimpleSAML/XHTML/Template.php | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/lib/SimpleSAML/XHTML/Template.php b/lib/SimpleSAML/XHTML/Template.php
index de1b38fc6..e1b96ab3a 100644
--- a/lib/SimpleSAML/XHTML/Template.php
+++ b/lib/SimpleSAML/XHTML/Template.php
@@ -24,7 +24,6 @@ class SimpleSAML_XHTML_Template {
private $language = null;
private $langtext = null;
- private $usebasetheme = false;
public $data = null;
@@ -136,17 +135,7 @@ class SimpleSAML_XHTML_Template {
$data = $this->data;
$filename = $this->configuration->getPathValue('templatedir') . $this->configuration->getValue('theme.use') . '/' . $file;
- if ($this->usebasetheme) {
- SimpleSAML_Logger::error($_SERVER['PHP_SELF'].' - Template: Using base for inclusion');
-
- $filename = $this->configuration->getPathValue('templatedir') . $this->configuration->getValue('theme.base') . '/' . $file;
- if (!file_exists($filename)) {
- SimpleSAML_Logger::error($_SERVER['PHP_SELF'].' - Template: Could not find template file [' . $file .
- '] at [' . $filename . ']');
- throw new Exception('Could not load template file [' . $file . ']');
- }
-
- } elseif (!file_exists($filename)) {
+ if (!file_exists($filename)) {
SimpleSAML_Logger::error($_SERVER['PHP_SELF'].' - Template: Could not find template file [' . $file .
'] at [' . $filename . '] - Now trying at base');
@@ -271,7 +260,6 @@ class SimpleSAML_XHTML_Template {
if (!file_exists($filename)) {
SimpleSAML_Logger::warning($_SERVER['PHP_SELF'].' - Template: Could not find template file [' . $this->template . '] at [' . $filename . '] - now trying the base template');
- $this->usebasetheme = true;
$filename = $this->configuration->getPathValue('templatedir') .
$this->configuration->getValue('theme.base') . '/' . $this->template;
--
GitLab