Added new method assets_url() to return full URL (including segment…

…s) of the assets directory
tastyigniter · Apr 4, 2016 · ac147ef · ac147ef
1 parent 8a8ed87
commit ac147ef
Show file tree

Hide file tree

Showing 29 changed files with 102 additions and 70 deletions.
diff --git a/admin/controllers/Coupons.php b/admin/controllers/Coupons.php
@@ -141,6 +141,11 @@ public function edit() {
 		$this->template->setButton($this->lang->line('button_save_close'), array('class' => 'btn btn-default', 'onclick' => 'saveClose();'));
 		$this->template->setButton($this->lang->line('button_icon_back'), array('class' => 'btn btn-default', 'href' => site_url('coupons')));
 
+		$this->template->setStyleTag(assets_url('js/datepicker/datepicker.css'), 'datepicker-css');
+		$this->template->setScriptTag(assets_url("js/datepicker/bootstrap-datepicker.js"), 'bootstrap-datepicker-js');
+		$this->template->setStyleTag(assets_url('js/datepicker/bootstrap-timepicker.css'), 'bootstrap-timepicker-css');
+		$this->template->setScriptTag(assets_url("js/datepicker/bootstrap-timepicker.js"), 'bootstrap-timepicker-js');
+
 		if ($this->input->post() AND $coupon_id = $this->_saveCoupon()) {
 			if ($this->input->post('save_close') === '1') {
 				redirect('coupons');

diff --git a/admin/controllers/Dashboard.php b/admin/controllers/Dashboard.php
@@ -20,12 +20,12 @@ public function index() {
 		$this->template->setHeading($this->lang->line('text_heading'));
 		$this->template->setButton($this->lang->line('button_check_updates'), array('class' => 'btn btn-default', 'href' => site_url('updates')));
 
-        $this->template->setStyleTag(root_url('assets/js/daterange/daterangepicker-bs3.css'), 'daterangepicker-css', '100400');
-        $this->template->setScriptTag(root_url('assets/js/daterange/moment.min.js'), 'daterange-moment-js', '1000451');
-        $this->template->setScriptTag(root_url('assets/js/daterange/daterangepicker.js'), 'daterangepicker-js', '1000452');
-        $this->template->setStyleTag(root_url('assets/js/morris/morris.css'), 'chart-css', '100500');
-        $this->template->setScriptTag(root_url('assets/js/morris/raphael-min.js'), 'raphael-min-js', '1000453');
-        $this->template->setScriptTag(root_url('assets/js/morris/morris.min.js'), 'morris-min-js', '1000454');
+        $this->template->setStyleTag(assets_url('js/daterange/daterangepicker-bs3.css'), 'daterangepicker-css', '100400');
+        $this->template->setScriptTag(assets_url('js/daterange/moment.min.js'), 'daterange-moment-js', '1000451');
+        $this->template->setScriptTag(assets_url('js/daterange/daterangepicker.js'), 'daterangepicker-js', '1000452');
+        $this->template->setStyleTag(assets_url('js/morris/morris.css'), 'chart-css', '100500');
+        $this->template->setScriptTag(assets_url('js/morris/raphael-min.js'), 'raphael-min-js', '1000453');
+        $this->template->setScriptTag(assets_url('js/morris/morris.min.js'), 'morris-min-js', '1000454');
 
 		$data['total_menus'] 		    = $this->Dashboard_model->getTotalMenus();
 		$data['current_month'] 			= mdate('%Y-%m', time());

diff --git a/admin/controllers/Image_manager.php b/admin/controllers/Image_manager.php
@@ -471,18 +471,18 @@ private function setTemplateTags($popup) {
             $this->template->setStyleTag('css/metisMenu.min.css', 'metis-menu-css', '12');
             $this->template->setStyleTag('css/select2.css', 'select2-css', '13');
             $this->template->setStyleTag('css/select2-bootstrap.css', 'select2-bootstrap-css', '14');
-            $this->template->setStyleTag(root_url('assets/css/imagemanager/dropzone.min.css'), 'dropzone-css', '15');
+            $this->template->setStyleTag(assets_url('css/imagemanager/dropzone.min.css'), 'dropzone-css', '15');
 	        $this->template->setStyleTag('css/fonts.css', 'fonts-css', '16');
-            $this->template->setStyleTag(root_url('assets/css/imagemanager/image-manager.css'), 'image-manager-css', '100');
+            $this->template->setStyleTag(assets_url('css/imagemanager/image-manager.css'), 'image-manager-css', '100');
 
             $this->template->setScriptTag('js/jquery-1.11.2.min.js', 'jquery-js', '1');
             $this->template->setScriptTag('js/bootstrap.min.js', 'bootstrap-js', '99');
-            $this->template->setScriptTag(root_url('assets/js/js.cookie.js'), 'js-cookie-js', '100');
+            $this->template->setScriptTag(assets_url('js/js.cookie.js'), 'js-cookie-js', '100');
             $this->template->setScriptTag('js/metisMenu.min.js', 'metis-menu-js', '101');
-            $this->template->setScriptTag(root_url('assets/js/imagemanager/bootbox.min.js'), 'bootbox-js', '102');
+            $this->template->setScriptTag(assets_url('js/imagemanager/bootbox.min.js'), 'bootbox-js', '102');
             $this->template->setScriptTag('js/select2.js', 'select-2-js', '103');
-            $this->template->setScriptTag(root_url('assets/js/imagemanager/dropzone.min.js'), 'dropzone-js', '104');
-            $this->template->setScriptTag(root_url('assets/js/imagemanager/selectonic.min.js'), 'selectonic-js', '107');
+            $this->template->setScriptTag(assets_url('js/imagemanager/dropzone.min.js'), 'dropzone-js', '104');
+            $this->template->setScriptTag(assets_url('js/imagemanager/selectonic.min.js'), 'selectonic-js', '107');
             $this->template->setScriptTag('js/common.js', 'common-js');
         }
 

diff --git a/admin/controllers/Mail_templates.php b/admin/controllers/Mail_templates.php
@@ -77,8 +77,8 @@ public function edit() {
 		$this->template->setButton($this->lang->line('button_save_close'), array('class' => 'btn btn-default', 'onclick' => 'saveClose();'));
 		$this->template->setButton($this->lang->line('button_icon_back'), array('class' => 'btn btn-default', 'href' => site_url('mail_templates')));
 
-		$this->template->setStyleTag(root_url('assets/js/summernote/summernote.css'), 'summernote-css');
-		$this->template->setScriptTag(root_url('assets/js/summernote/summernote.min.js'), 'summernote-js');
+		$this->template->setStyleTag(assets_url('js/summernote/summernote.css'), 'summernote-css');
+		$this->template->setScriptTag(assets_url('js/summernote/summernote.min.js'), 'summernote-js');
 
 		if ($this->input->post() AND $template_id = $this->_saveTemplate()) {
 			if ($this->input->post('save_close') === '1') {

diff --git a/admin/controllers/Menu_options.php b/admin/controllers/Menu_options.php
@@ -122,6 +122,8 @@ public function edit() {
 		$this->template->setButton($this->lang->line('button_save_close'), array('class' => 'btn btn-default', 'onclick' => 'saveClose();'));
 		$this->template->setButton($this->lang->line('button_icon_back'), array('class' => 'btn btn-default', 'href' => site_url('menu_options')));
 
+		$this->template->setScriptTag(assets_url('js/jquery-sortable.js'), 'jquery-sortable-js');
+
 		if ($this->input->post() AND $option_id = $this->_saveOption()){
 			if ($this->input->post('save_close') === '1') {
 				redirect('menu_options');

diff --git a/admin/controllers/Menus.php b/admin/controllers/Menus.php
@@ -152,6 +152,9 @@ public function edit() {
 		$this->template->setButton($this->lang->line('button_save_close'), array('class' => 'btn btn-default', 'onclick' => 'saveClose();'));
 		$this->template->setButton($this->lang->line('button_icon_back'), array('class' => 'btn btn-default', 'href' => site_url('menus')));
 
+		$this->template->setStyleTag(assets_url('js/datepicker/datepicker.css'), 'datepicker-css');
+		$this->template->setScriptTag(assets_url("js/datepicker/bootstrap-datepicker.js"), 'bootstrap-datepicker-js');
+
 		if ($this->input->post() AND $menu_id = $this->_saveMenu()) {
 			if ($this->input->post('save_close') === '1') {
 				redirect('menus');

diff --git a/admin/controllers/Messages.php b/admin/controllers/Messages.php
@@ -188,8 +188,8 @@ public function compose() {
         $this->template->setButton($this->lang->line('button_save_draft'), array('class' => 'btn btn-default', 'onclick' => 'saveAsDraft();'));
         $this->template->setButton($this->lang->line('button_icon_back'), array('class' => 'btn btn-default', 'href' => site_url('messages')));
 
-        $this->template->setStyleTag(root_url('assets/js/summernote/summernote.css'), 'summernote-css', '111');
-        $this->template->setScriptTag(root_url('assets/js/summernote/summernote.min.js'), 'summernote-js', '111');
+        $this->template->setStyleTag(assets_url('js/summernote/summernote.css'), 'summernote-css', '111');
+        $this->template->setScriptTag(assets_url('js/summernote/summernote.min.js'), 'summernote-js', '111');
 
         if ($this->input->post() AND $message_id = $this->_saveMessage()) {
             if ($this->input->post('save_as_draft') === '1') {

diff --git a/admin/controllers/Pages.php b/admin/controllers/Pages.php
@@ -98,8 +98,8 @@ public function edit() {
 		$this->template->setButton($this->lang->line('button_save_close'), array('class' => 'btn btn-default', 'onclick' => 'saveClose();'));
 		$this->template->setButton($this->lang->line('button_icon_back'), array('class' => 'btn btn-default', 'href' => site_url('pages')));
 
-		$this->template->setStyleTag(root_url('assets/js/summernote/summernote.css'), 'summernote-css');
-		$this->template->setScriptTag(root_url('assets/js/summernote/summernote.min.js'), 'summernote-js');
+		$this->template->setStyleTag(assets_url('js/summernote/summernote.css'), 'summernote-css');
+		$this->template->setScriptTag(assets_url('js/summernote/summernote.min.js'), 'summernote-js');
 
 		if ($this->input->post() AND $page_id = $this->_savePage()) {
 			if ($this->input->post('save_close') === '1') {

diff --git a/admin/controllers/Ratings.php b/admin/controllers/Ratings.php
@@ -11,6 +11,8 @@ public function index() {
         $this->template->setHeading($this->lang->line('text_heading'));
 		$this->template->setButton($this->lang->line('button_save'), array('class' => 'btn btn-primary', 'onclick' => '$(\'#edit-form\').submit();'));
 
+		$this->template->setScriptTag(assets_url('js/jquery-sortable.js'), 'jquery-sortable-js');
+
 		if ($this->input->post() AND $this->_updateRating() === TRUE) {
 			redirect('ratings');
 		}

diff --git a/admin/controllers/Security_questions.php b/admin/controllers/Security_questions.php
@@ -17,6 +17,8 @@ public function index() {
         $this->template->setHeading($this->lang->line('text_heading'));
 		$this->template->setButton($this->lang->line('button_save'), array('class' => 'btn btn-primary', 'onclick' => '$(\'#edit-form\').submit();'));
 
+		$this->template->setScriptTag(assets_url('js/jquery-sortable.js'), 'jquery-sortable-js');
+
 		if ($this->input->post() AND $this->_updateSecurityQuestion() === TRUE){
 			redirect('security_questions');
 		}

diff --git a/admin/controllers/Statuses.php b/admin/controllers/Statuses.php
@@ -111,6 +111,9 @@ public function edit() {
 		$this->template->setButton($this->lang->line('button_save_close'), array('class' => 'btn btn-default', 'onclick' => 'saveClose();'));
 		$this->template->setButton($this->lang->line('button_icon_back'), array('class' => 'btn btn-default', 'href' => site_url('statuses')));
 
+		$this->template->setStyleTag(assets_url('js/colorpicker/css/bootstrap-colorpicker.min.css'), 'bootstrap-colorpicker-css');
+		$this->template->setScriptTag(assets_url('js/colorpicker/js/bootstrap-colorpicker.min.js'), 'bootstrap-colorpicker-js');
+
 		if ($this->input->post() AND $status_id = $this->_saveStatus()) {
 			if ($this->input->post('save_close') === '1') {
 				redirect('statuses');

diff --git a/admin/controllers/Themes.php b/admin/controllers/Themes.php
@@ -72,17 +72,17 @@ public function edit() {
 		$this->template->setButton($this->lang->line('button_save_close'), array('class' => 'btn btn-default', 'onclick' => 'saveClose();'));
 		$this->template->setButton($this->lang->line('button_icon_back'), array('class' => 'btn btn-default', 'href' => site_url('themes')));
 
-		$this->template->setStyleTag(root_url('assets/js/colorpicker/css/bootstrap-colorpicker.min.css'), 'bootstrap-colorpicker-css');
-		$this->template->setStyleTag(root_url('assets/js/codemirror/codemirror.css'), 'codemirror-css');
-		$this->template->setScriptTag(root_url('assets/js/colorpicker/js/bootstrap-colorpicker.min.js'), 'bootstrap-colorpicker-js');
-		$this->template->setScriptTag(root_url('assets/js/codemirror/codemirror.js'), 'codemirror-js', '300');
-		$this->template->setScriptTag(root_url('assets/js/codemirror/xml/xml.js'), 'codemirror-xml-js', '301');
-		$this->template->setScriptTag(root_url('assets/js/codemirror/css/css.js'), 'codemirror-css-js', '302');
-		$this->template->setScriptTag(root_url('assets/js/codemirror/javascript/javascript.js'), 'codemirror-javascript-js', '303');
-		$this->template->setScriptTag(root_url('assets/js/codemirror/php/php.js'), 'codemirror-php-js', '304');
-		$this->template->setScriptTag(root_url('assets/js/codemirror/htmlmixed/htmlmixed.js'), 'codemirror-htmlmixed-js', '305');
-		$this->template->setScriptTag(root_url('assets/js/codemirror/clike/clike.js'), 'codemirror-clike-js', '306');
-		$this->template->setScriptTag(root_url('assets/js/jquery-sortable.js'), 'jquery-sortable-js');
+		$this->template->setStyleTag(assets_url('js/colorpicker/css/bootstrap-colorpicker.min.css'), 'bootstrap-colorpicker-css');
+		$this->template->setStyleTag(assets_url('js/codemirror/codemirror.css'), 'codemirror-css');
+		$this->template->setScriptTag(assets_url('js/colorpicker/js/bootstrap-colorpicker.min.js'), 'bootstrap-colorpicker-js');
+		$this->template->setScriptTag(assets_url('js/codemirror/codemirror.js'), 'codemirror-js', '300');
+		$this->template->setScriptTag(assets_url('js/codemirror/xml/xml.js'), 'codemirror-xml-js', '301');
+		$this->template->setScriptTag(assets_url('js/codemirror/css/css.js'), 'codemirror-css-js', '302');
+		$this->template->setScriptTag(assets_url('js/codemirror/javascript/javascript.js'), 'codemirror-javascript-js', '303');
+		$this->template->setScriptTag(assets_url('js/codemirror/php/php.js'), 'codemirror-php-js', '304');
+		$this->template->setScriptTag(assets_url('js/codemirror/htmlmixed/htmlmixed.js'), 'codemirror-htmlmixed-js', '305');
+		$this->template->setScriptTag(assets_url('js/codemirror/clike/clike.js'), 'codemirror-clike-js', '306');
+		$this->template->setScriptTag(assets_url('js/jquery-sortable.js'), 'jquery-sortable-js');
 
 		if ($this->input->post() AND $this->_updateTheme($theme) === TRUE) {
 			if ($this->input->post('save_close') === '1') {

diff --git a/admin/controllers/Uri_routes.php b/admin/controllers/Uri_routes.php
@@ -16,6 +16,8 @@ public function index() {
 		$this->template->setHeading('URI Routes');
 		$this->template->setButton($this->lang->line('button_save'), array('class' => 'btn btn-primary', 'onclick' => '$(\'#edit-form\').submit();'));
 
+		$this->template->setScriptTag(assets_url('js/jquery-sortable.js'), 'jquery-sortable-js');
+
 		if ($this->input->post() AND $this->_updateRoute() === TRUE){
 			redirect('uri_routes');
 		}

diff --git a/admin/views/themes/tastyigniter-blue/coupons_edit.php b/admin/views/themes/tastyigniter-blue/coupons_edit.php
@@ -297,10 +297,6 @@
 		</form>
 	</div>
 </div>
-<link type="text/css" rel="stylesheet" href="<?php echo root_url("assets/js/datepicker/datepicker.css"); ?>">
-<link type="text/css" rel="stylesheet" href="<?php echo root_url("assets/js/datepicker/bootstrap-timepicker.css"); ?>">
-<script type="text/javascript" src="<?php echo root_url("assets/js/datepicker/bootstrap-datepicker.js"); ?>"></script>
-<script type="text/javascript" src="<?php echo root_url("assets/js/datepicker/bootstrap-timepicker.js"); ?>"></script>
 <script type="text/javascript"><!--
 $(document).ready(function() {
 

diff --git a/admin/views/themes/tastyigniter-blue/header.php b/admin/views/themes/tastyigniter-blue/header.php
@@ -15,7 +15,7 @@
 
     $this->template->setScriptTag('js/jquery-1.11.2.min.js', 'jquery-js', '1');
     $this->template->setScriptTag('js/bootstrap.min.js', 'bootstrap-js', '10');
-	$this->template->setScriptTag(root_url('assets/js/js.cookie.js'), 'js-cookie-js', '14');
+	$this->template->setScriptTag(assets_url('js/js.cookie.js'), 'js-cookie-js', '14');
 	$this->template->setScriptTag('js/metisMenu.min.js', 'metis-menu-js', '11');
 	$this->template->setScriptTag('js/select2.js', 'select-2-js', '12');
 	$this->template->setScriptTag('js/jquery.raty.js', 'jquery-raty-js', '13');

diff --git a/admin/views/themes/tastyigniter-blue/menu_options_edit.php b/admin/views/themes/tastyigniter-blue/menu_options_edit.php
@@ -119,7 +119,6 @@ function addValue() {
 	table_row++;
 }
 //--></script>
-<script src="<?php echo root_url("assets/js/jquery-sortable.js"); ?>"></script>
 <script type="text/javascript"><!--
 $(function () {
 	$('.table-sortable').sortable({
@@ -129,6 +128,6 @@ function addValue() {
 		placeholder: '<tr class="placeholder"><td colspan="3"></td></tr>',
 		handle: '.handle'
 	})
-})
+});
 //--></script>
 <?php echo get_footer(); ?>
diff --git a/admin/views/themes/tastyigniter-blue/menus_edit.php b/admin/views/themes/tastyigniter-blue/menus_edit.php
@@ -315,8 +315,6 @@
 		</form>
 	</div>
 </div>
-<link type="text/css" rel="stylesheet" href="<?php echo root_url("assets/js/datepicker/datepicker.css"); ?>">
-<script type="text/javascript" src="<?php echo root_url("assets/js/datepicker/bootstrap-datepicker.js"); ?>"></script>
 <script type="text/javascript"><!--
 $(document).ready(function() {
 	$('#start-date, #end-date').datepicker({

diff --git a/admin/views/themes/tastyigniter-blue/ratings.php b/admin/views/themes/tastyigniter-blue/ratings.php
@@ -55,7 +55,6 @@ function addRating() {
 	table_row++;
 }
 //--></script>
-<script src="<?php echo root_url("assets/js/jquery-sortable.js"); ?>"></script>
 <script type="text/javascript"><!--
 $(function () {
 	$('.table-sortable').sortable({
@@ -65,6 +64,6 @@ function addRating() {
 		placeholder: '<tr class="placeholder"><td colspan="2"></td></tr>',
 		handle: '.handle'
 	})
-})
+});
 //--></script>
 <?php echo get_footer(); ?>
diff --git a/admin/views/themes/tastyigniter-blue/security_questions.php b/admin/views/themes/tastyigniter-blue/security_questions.php
@@ -70,7 +70,6 @@ function addQuestion() {
 	table_row++;
 }
 //--></script>
-<script src="<?php echo root_url("assets/js/jquery-sortable.js"); ?>"></script>
 <script type="text/javascript"><!--
 $(function  () {
 	$('.table-sortable').sortable({
@@ -80,6 +79,6 @@ function addQuestion() {
 		placeholder: '<tr class="placeholder"><td colspan="3"></td></tr>',
 		handle: '.handle'
 	})
-})
+});
 //--></script>
 <?php echo get_footer(); ?>
diff --git a/admin/views/themes/tastyigniter-blue/statuses_edit.php b/admin/views/themes/tastyigniter-blue/statuses_edit.php
@@ -74,8 +74,6 @@
 		</form>
 	</div>
 </div>
-<link type="text/css" rel="stylesheet" href="<?php echo root_url("assets/js/colorpicker/css/bootstrap-colorpicker.min.css"); ?>">
-<script src="<?php echo root_url("assets/js/colorpicker/js/bootstrap-colorpicker.min.js"); ?>"></script>
 <script type="text/javascript"><!--
 $(document).ready(function() {
     $('.ti-color-picker').colorpicker();

diff --git a/admin/views/themes/tastyigniter-blue/uri_routes.php b/admin/views/themes/tastyigniter-blue/uri_routes.php
@@ -64,7 +64,6 @@ function addRoute() {
 	table_row++;
 }
 //--></script>
-<script src="<?php echo root_url("assets/js/jquery-sortable.js"); ?>"></script>
 <script type="text/javascript"><!--
 $(function  () {
 	$('.table-sortable').sortable({
@@ -74,6 +73,6 @@ function addRoute() {
 		placeholder: '<tr class="placeholder"><td colspan="4"></td></tr>',
 		handle: '.handle'
 	})
-})
+});
 //--></script>
 <?php echo get_footer(); ?>
diff --git a/extensions/reservation_module/controllers/Reservation_module.php b/extensions/reservation_module/controllers/Reservation_module.php
@@ -14,10 +14,10 @@ public function index() {
 		}
 
         $this->template->setStyleTag(extension_url('reservation_module/views/stylesheet.css'), 'reservation-module-css', '154000');
-        $this->template->setStyleTag(base_url('assets/js/datepicker/datepicker.css'), 'datepicker-css', '124000');
-        $this->template->setScriptTag(base_url("assets/js/datepicker/bootstrap-datepicker.js"), 'bootstrap-datepicker-js', '12000');
-        $this->template->setStyleTag(base_url('assets/js/datepicker/bootstrap-timepicker.css'), 'bootstrap-timepicker-css', '124440');
-        $this->template->setScriptTag(base_url("assets/js/datepicker/bootstrap-timepicker.js"), 'bootstrap-timepicker-js', '12550');
+        $this->template->setStyleTag(assets_url('js/datepicker/datepicker.css'), 'datepicker-css', '124000');
+        $this->template->setScriptTag(assets_url("js/datepicker/bootstrap-datepicker.js"), 'bootstrap-datepicker-js', '12000');
+        $this->template->setStyleTag(assets_url('js/datepicker/bootstrap-timepicker.css'), 'bootstrap-timepicker-css', '124440');
+        $this->template->setScriptTag(assets_url("js/datepicker/bootstrap-timepicker.js"), 'bootstrap-timepicker-js', '12550');
 
         if ($this->config->item('reservation_mode') !== '1') {
             $this->alert->set('alert', $this->lang->line('alert_reservation_disabled'));

diff --git a/setup/controllers/Setup.php b/setup/controllers/Setup.php
@@ -165,7 +165,7 @@ public function success() {
         $data['text_heading'] 		= $this->lang->line('text_success_heading');
         $data['text_sub_heading'] 	= $this->lang->line('text_success_sub_heading');
         $data['setup_step'] 	    = $this->setup_step;
-        $data['admin_url'] 	        = root_url(ADMINDIR);
+        $data['admin_url'] 	        = admin_url();
         $data['site_url'] 	        = root_url();
 
         $this->load->library('user');

diff --git a/system/tastyigniter/core/Admin_Controller.php b/system/tastyigniter/core/Admin_Controller.php
@@ -38,7 +38,7 @@ public function __construct()
         if (!$this->user->isLogged() AND $uri !== 'login' AND $uri !== 'logout') {
             $this->alert->set('danger', $this->lang->line('alert_user_not_logged_in'));
             $prepend = empty($uri) ? '' : '?redirect=' . current_url();
-            redirect(root_url(ADMINDIR.'/login'.$prepend));
+            redirect(admin_url('login'.$prepend));
         }
     }
 }

diff --git a/system/tastyigniter/core/Base_Controller.php b/system/tastyigniter/core/Base_Controller.php
@@ -42,7 +42,7 @@ public function __construct()
 
         // If 'config/updated.txt' exists, system needs upgrade
         if (is_file(IGNITEPATH . 'config/updated.txt')) {
-            if ($this->installer->upgrade()) redirect(root_url(ADMINDIR.'/dashboard'));
+            if ($this->installer->upgrade()) redirect(admin_url('dashboard'));
         }
 
         // Redirect to setup if app requires setup