Changeset 852

Timestamp:

09/17/07 19:15:15 (15 months ago)

Author:

freakerz

Message:

Fixing two problems prior commit caused.

is_callable() for some reason did not work right.

k2 theme.php used $this in a non-object context, using User::identify() now.

Sorry!

Location:

trunk/htdocs

Files:

• system/classes/theme.php (modified) (3 diffs)
• user/themes/k2/theme.php (modified) (1 diff)

trunk/htdocs/system/classes/theme.php

@@ -356 +356 @@
         $this->template_engine->$key= $value;
     }
-    
     
     /**
@@ -363 +362 @@
     public function header() {
         Plugins::act( 'template_header' );
-        if ( is_callable( array( THEME_CLASS, 'header' ) ) ) {
+        if ( function_exists( THEME_CLASS . '::header' ) ) {
             call_user_func( array( THEME_CLASS, 'header' ) );
         }
@@ -378 +377 @@
     public function footer() {
         Plugins::act( 'template_footer' );
-        if ( is_callable( array( THEME_CLASS, 'footer' ) ) ) {
+        if ( function_exists( THEME_CLASS . '::footer' ) ) {
             call_user_func( array( THEME_CLASS, 'footer' ) );
         }

trunk/htdocs/user/themes/k2/theme.php

@@ -65 +65 @@
     public function header()
     {
-        if ( $this->user instanceof User ) {
+        if ( User::identify() != FALSE ) {
             Stack::add( 'template_header_javascript', Site::get_url('scripts') . '/jquery.js', 'jquery' );
         }