From c5536aac5752054f7f76e448d58b86407d8f574e Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Thu, 1 Nov 2012 17:33:58 +0200
Subject: Manually apply PR #1594 (fixing phpdoc page-level
 generation/warnings)

Also partially fixes issue #1295, fixes inconsistencies in some page-level docblocks and adds include checks in language files.
---
 system/core/Controller.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'system/core/Controller.php')

diff --git a/system/core/Controller.php b/system/core/Controller.php
index 8c2ba893e..ee6fec8d5 100644
--- a/system/core/Controller.php
+++ b/system/core/Controller.php
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 /**
  * CodeIgniter
  *
@@ -24,6 +24,7 @@
  * @since		Version 1.0
  * @filesource
  */
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 /**
  * Application Controller Class
-- 
cgit v1.2.3-24-g4f1b


From 679525d0237ac2e0a94d7b05377eb31eb3398f19 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Sat, 3 Nov 2012 00:35:48 +0200
Subject: Removed CI_Loader::initialize() and moved its logic to the
 constructor.

That method used to be called by the CI_Controller constructor
and was required because of the possibility to instantiate the
Controller class twice due to 404_override, and so some properties
needed to be reset.

Following the last commit - this is no longer the case.
---
 system/core/Controller.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'system/core/Controller.php')

diff --git a/system/core/Controller.php b/system/core/Controller.php
index ee6fec8d5..cbdf0515f 100644
--- a/system/core/Controller.php
+++ b/system/core/Controller.php
@@ -65,7 +65,6 @@ class CI_Controller {
 		}
 
 		$this->load =& load_class('Loader', 'core');
-		$this->load->initialize();
 		log_message('debug', 'Controller Class Initialized');
 	}
 
-- 
cgit v1.2.3-24-g4f1b


From cdac248e9cf7a8ea3ed426f189bb52254800bc2a Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Sat, 3 Nov 2012 18:09:01 +0200
Subject: Revert 679525d0237ac2e0a94d7b05377eb31eb3398f19

It appears to break get_instance()->*_package_path*() usage which is very common.
Need to figure out how to resolve this.
---
 system/core/Controller.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'system/core/Controller.php')

diff --git a/system/core/Controller.php b/system/core/Controller.php
index cbdf0515f..ee6fec8d5 100644
--- a/system/core/Controller.php
+++ b/system/core/Controller.php
@@ -65,6 +65,7 @@ class CI_Controller {
 		}
 
 		$this->load =& load_class('Loader', 'core');
+		$this->load->initialize();
 		log_message('debug', 'Controller Class Initialized');
 	}
 
-- 
cgit v1.2.3-24-g4f1b