From 8a4ab78bfb0bbf49e0a1db1e9e0576712bb04bc2 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Mon, 3 Nov 2008 06:02:40 +0000 Subject: Oops, injecting the function name caused an extra call in the call stack. The test passed, but the actual code failed. Fixed now. --- core/helpers/theme.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'core/helpers') diff --git a/core/helpers/theme.php b/core/helpers/theme.php index 2146f322..5aa568c7 100644 --- a/core/helpers/theme.php +++ b/core/helpers/theme.php @@ -21,9 +21,12 @@ class theme_Core { public static $debug_backtrace = "debug_backtrace"; public static function url($path) { - $caller = array_shift(call_user_func(theme::$debug_backtrace)); - $calling_file = $caller['file']; - $theme_name = substr($caller['file'], strlen(THEMEPATH)); + // Using debug_backtrace() sucks. But I don't know of another way to get + // the location of the caller without forcing them to pass it in as an argument, which + // makes for a crappy API. + $backtrace = call_user_func(theme::$debug_backtrace); + $calling_file = $backtrace[1]['file']; + $theme_name = substr($calling_file, strlen(THEMEPATH)); $theme_name = substr($theme_name, 0, strcspn($theme_name, "/")); return url::base() . "themes/{$theme_name}/$path"; } -- cgit v1.2.3