Permalink
Browse files

Post-merge cleanup

  • Loading branch information...
1 parent 3cff66a commit 5278647ace98c91d07770a8356989989f4439571 @dchill42 committed Aug 1, 2012
@@ -55,9 +55,9 @@ private function __construct()
set_error_handler('_exception_handler');
// Kill magic quotes for older versions
- if ( ! is_php('5.3'))
+ if ( ! is_php('5.4'))
{
- @set_magic_quotes_runtime(0);
+ @ini_set('magic_quotes_runtime', 0);
}
log_message('debug', 'CodeIgniter Class Initialized');
@@ -338,7 +338,7 @@ function &get_instance()
* Is there a valid cache file? If so, we're done...
* ------------------------------------------------------
*/
- if ($CI->hooks->_call_hook('cache_override') === FALSE && $CI->output->_display_cache($CI->config, $CI->uri) === TRUE)
+ if ($CI->hooks->_call_hook('cache_override') === FALSE && $CI->output->_display_cache() === TRUE)
{
exit;
}
@@ -450,4 +450,4 @@ function &get_instance()
$CI->hooks->_call_hook('post_system');
/* End of file CodeIgniter.php */
-/* Location: ./system/core/CodeIgniter.php */
+/* Location: ./system/core/CodeIgniter.php */
@@ -9,7 +9,7 @@
* Licensed under the Open Software License version 3.0
*
* This source file is subject to the Open Software License (OSL 3.0) that is
- * bundled with this package in the files license.txt / license.rst. It is
+ * bundled with this package in the files license.txt / license.rst. It is
* also available through the world wide web at this URL:
* http://opensource.org/licenses/OSL-3.0
* If you did not receive a copy of the license and are unable to obtain it
@@ -41,27 +41,17 @@ class CI_Config {
* List of all loaded config values
*
* @var array
- * @access protected
*/
public $config = array();
/**
* List of all loaded config files
*
* @var array
- * @access protected
*/
public $is_loaded = array();
/**
- * Callback to array merging function
- *
- * @var callback
- * @access protected
- */
- protected $merge_arrays;
-
- /**
* List of paths to search when trying to load a config file.
* This must be public as it's used by the Loader class.
*
@@ -70,6 +60,13 @@ class CI_Config {
public $_config_paths = array(APPPATH);
/**
+ * Callback to array merging function
+ *
+ * @var callback
+ */
+ protected $merge_arrays;
+
+ /**
* Constructor
*
* Sets the $config data from the primary config.php file as a class variable
@@ -280,29 +277,10 @@ public function item($item, $index = '')
{
if ($index == '')
{
- if ( ! isset($this->config[$item]))
- {
- return FALSE;
- }
-
- $pref = $this->config[$item];
- }
- else
- {
- if ( ! isset($this->config[$index]))
- {
- return FALSE;
- }
-
- if ( ! isset($this->config[$index][$item]))
- {
- return FALSE;
- }
-
- $pref = $this->config[$index][$item];
+ return isset($this->config[$item]) ? $this->config[$item] : FALSE;
}
- return $pref;
+ return isset($this->config[$index], $this->config[$index][$item]) ? $this->config[$index][$item] : FALSE;
}
// --------------------------------------------------------------------
@@ -468,7 +446,6 @@ public function _assign_to_config($items = array())
* The main (existing) array is copied as a parameter, modified with the contents of
* the new array (which is referenced), and returned.
*
- * @access protected
* @param array main array
* @param array new array of values to merge in
* @return array merged array
@@ -486,8 +463,7 @@ protected function _merge_arrays(array $main, array &$new)
// Return merged array
return $main;
}
-
}
/* End of file Config.php */
-/* Location: ./system/core/Config.php */
+/* Location: ./system/core/Config.php */
@@ -35,12 +35,6 @@
* @link http://codeigniter.com/user_guide/libraries/exceptions.html
*/
class CI_Exceptions {
- var $action;
- var $severity;
- var $message;
- var $filename;
- var $line;
-
/**
* Nesting level of the output buffering mechanism
*
@@ -54,18 +48,18 @@ class CI_Exceptions {
* @var array
*/
public $levels = array(
- E_ERROR => 'Error',
- E_WARNING => 'Warning',
- E_PARSE => 'Parsing Error',
- E_NOTICE => 'Notice',
+ E_ERROR => 'Error',
+ E_WARNING => 'Warning',
+ E_PARSE => 'Parsing Error',
+ E_NOTICE => 'Notice',
E_CORE_ERROR => 'Core Error',
E_CORE_WARNING => 'Core Warning',
E_COMPILE_ERROR => 'Compile Error',
E_COMPILE_WARNING => 'Compile Warning',
E_USER_ERROR => 'User Error',
E_USER_WARNING => 'User Warning',
E_USER_NOTICE => 'User Notice',
- E_STRICT => 'Runtime Notice'
+ E_STRICT => 'Runtime Notice'
);
/**
@@ -227,4 +221,4 @@ public function show_php_error($severity, $message, $filepath, $line)
}
/* End of file Exceptions.php */
-/* Location: ./system/core/Exceptions.php */
+/* Location: ./system/core/Exceptions.php */
@@ -125,7 +125,6 @@ public function call_hook($which = '')
*
* Runs a particular hook
*
- * @access protected
* @param array the hook details
* @return bool
*/
@@ -227,4 +226,4 @@ protected function _run_hook($data)
}
/* End of file Hooks.php */
-/* Location: ./system/core/Hooks.php */
+/* Location: ./system/core/Hooks.php */
Oops, something went wrong.

0 comments on commit 5278647

Please sign in to comment.