Changeset 2806

Timestamp:

11/13/08 18:51:49 (8 weeks ago)

Author:

chrismeller

Message:

Moving the admin stacks initialization into AdminHandler's constructor, where it should have been to begin with.

If you need stacks from a plugin, call the AdminHandler::setup_stacks() method, then check the stack.

Location:

trunk/htdocs

Files:

• index.php (modified) (1 diff)
• system/classes/adminhandler.php (modified) (5 diffs)

trunk/htdocs/index.php

@@ -192 +192 @@
 header( 'Content-Type: text/html;charset=utf-8' );
 
-// setup some initial stacks
-AdminHandler::setup_stacks();
-
 /**
  * Include all the active plugins.

trunk/htdocs/system/classes/adminhandler.php

@@ -60 +60 @@
         // Create an instance of the active public theme so that its plugin functions are implemented
         $this->active_theme = Themes::create();
+
+        // setup the stacks for javascript in the admin - it's a method so a plugin can call it externally
+        self::setup_stacks();
     }
 
@@ -71 +74 @@
         $theme_dir = Plugins::filter( 'admin_theme_dir', Site::get_dir( 'admin_theme', TRUE ) );
         $this->theme = Themes::create( 'admin', 'RawPHPEngine', $theme_dir );
-        
-        // Add some default js
-        $this->setup_stacks();
+
         // Add some default stylesheets
         Stack::add('admin_stylesheet', array(Site::get_url('admin_theme') . '/css/admin.css', 'screen'), 'admin');
 
-      // Add some default template variables
+        // Add some default template variables
         $this->set_admin_template_vars( $this->theme );
         $this->theme->admin_type = $type;
@@ -676 +677 @@
     {
         extract( $this->handler_vars );
-        
+
         $wsse = Utils::WSSE( $nonce, $timestamp );
         if ( $PasswordDigest != $wsse['digest'] ) {
             Utils::redirect( URL::get( 'admin', 'page=users' ) );
         }
-        
+
         // Keep track of whether we actually need to update any fields
         $update = FALSE;
         $results = array( 'page' => 'user' );
         $currentuser = User::identify();
-        
+
         $fields = array( 'user_id' => 'id', 'delete' => NULL, 'username' => 'username', 'displayname' => 'displayname', 'email' => 'email', 'imageurl' => 'imageurl', 'pass1' => NULL, 'locale_tz' => 'locale_tz', 'locale_date_format' => 'locale_date_format', 'locale_time_format' => 'locale_time_format' );
         $fields = Plugins::filter( 'adminhandler_post_user_fields', $fields );
@@ -2328 +2329 @@
     {
         $this->theme->wsse = Utils::WSSE(); /* @TODO: What the heck is this doing here? */
-        
+
         $this->theme->tags = Tags::get();
         $this->theme->max = Tags::max_count();
-        
+
         $this->display( 'tags' );
     }
@@ -2577 +2578 @@
         return false;
     }
-    
+
     /**
      * Setup the default admin javascript stack here so that it can be called