From 863e353911c5bab59e4bd6e9d0d70f79bcf37e46 Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Fri, 20 Mar 2009 17:20:17 +0000 Subject: rollback of r20469... see trac #161 --- core/libraries/Admin_View.php | 5 ----- core/libraries/Theme_View.php | 6 +----- 2 files changed, 1 insertion(+), 10 deletions(-) (limited to 'core') diff --git a/core/libraries/Admin_View.php b/core/libraries/Admin_View.php index e88b01ee..9ca585d2 100644 --- a/core/libraries/Admin_View.php +++ b/core/libraries/Admin_View.php @@ -45,11 +45,6 @@ class Admin_View_Core extends View { return $absolute_url ? url::abs_file($arg) : url::file($arg); } - public function file($path) { - $theme_path = "themes/{$this->theme_name}/$path"; - return url::file(file_exists($theme_path) ? $theme_path : $path); - } - public function display($page_name, $view_class="View") { return new $view_class($page_name); } diff --git a/core/libraries/Theme_View.php b/core/libraries/Theme_View.php index fba61afe..84d86b0b 100644 --- a/core/libraries/Theme_View.php +++ b/core/libraries/Theme_View.php @@ -46,6 +46,7 @@ class Theme_View_Core extends View { if ($maintenance_mode) { message::warning(t("This site is currently in maintenance mode")); } + } public function url($path, $absolute_url=false) { @@ -53,11 +54,6 @@ class Theme_View_Core extends View { return $absolute_url ? url::abs_file($arg) : url::file($arg); } - public function file($path) { - $theme_path = "themes/{$this->theme_name}/$path"; - return url::file(file_exists($theme_path) ? $theme_path : $path); - } - public function item() { return $this->item; } -- cgit v1.2.3