Fix installer

st3ph · Mar 9, 2015 · 508b8f2 · 508b8f2
1 parent 2c18997
commit 508b8f2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/app/Config/core.php b/app/Config/core.php
@@ -38,7 +38,7 @@
 
 
 	Configure::write('debug', 0);
-	Configure::write('mushraider', array('version' => '1.5.2.1', 'date' => '2015-03-09'));
+	Configure::write('mushraider', array('version' => '1.5.2.2', 'date' => '2015-03-10'));
 
 /**
  * Configure the Error handler used to handle errors for your application. By default

diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php
@@ -33,7 +33,7 @@
  * @link		http://book.cakephp.org/2.0/en/controllers.html#the-app-controller
  */
 class AppController extends Controller {
-    public $components = array('Session', 'Cookie', 'Lang', 'Tools', 'Patcher', 'Tour');
+    public $components = array('Session', 'Cookie', 'Lang', 'Tools', 'Patcher');
     var $uses = array('User', 'Role', 'Setting', 'Character');
 
     var $user = null;

diff --git a/app/Controller/Component/TourComponent.php b/app/Controller/Component/TourComponent.php
@@ -8,6 +8,10 @@ class TourComponent extends Component {
 
     public function initialize(Controller $controller) {
         $this->controller = &$controller;
+    }
+
+    public function startup(Controller $controller) {
+        $this->controller = &$controller;
 
         $this->tourGuides = json_decode($this->controller->Setting->getOption('tourGuides'), true);
 
@@ -58,10 +62,6 @@ public function initialize(Controller $controller) {
                 )
             )
         );
-    }
-
-    public function startup(Controller $controller) {
-        $this->controller = &$controller;
 
         if($this->controller->user && $this->controller->user['User']['can']['full_permissions']) {
             if(!empty($this->tourList[$this->controller->name]) && !empty($this->tourList[$this->controller->name][$this->controller->action])) {

diff --git a/app/Controller/EventsController.php b/app/Controller/EventsController.php
@@ -1,6 +1,6 @@
 <?php
 class EventsController extends AppController {
-    public $components = array('Emailing', 'Image');
+    public $components = array('Emailing', 'Image', 'Tour');
     var $helpers = array('Sociable.Comment');
     var $uses = array('Game', 'Dungeon', 'Event', 'RaidsRole', 'EventsRole', 'EventsCharacter', 'Character', 'EventsTemplate', 'EventsTemplatesRole', 'Report');