summaryrefslogtreecommitdiffstats
path: root/system/codeigniter
diff options
context:
space:
mode:
authorDerek Allard <derek.allard@ellislab.com>2008-05-13 04:01:47 +0200
committerDerek Allard <derek.allard@ellislab.com>2008-05-13 04:01:47 +0200
commit0fd8f0201d843b0b4a2de614c9be2b060d1787fc (patch)
tree1a9dd3f534cd179a197392cc34fc5f3ce355f7c4 /system/codeigniter
parent459a8b8569f0a9ad68e928e7a3096923e6df0f2f (diff)
minor source formatting
Diffstat (limited to 'system/codeigniter')
-rw-r--r--system/codeigniter/CodeIgniter.php5
-rw-r--r--system/codeigniter/Common.php22
2 files changed, 13 insertions, 14 deletions
diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php
index 4eb31cbcd..5a01eb86c 100644
--- a/system/codeigniter/CodeIgniter.php
+++ b/system/codeigniter/CodeIgniter.php
@@ -229,8 +229,8 @@ else
}
// Call the requested method.
- // Any URI segments present (besides the class/function) will be passed to the method for convenience
- call_user_func_array(array(&$CI, $method), array_slice($URI->rsegments, 2));
+ // Any URI segments present (besides the class/function) will be passed to the method for convenience
+ call_user_func_array(array(&$CI, $method), array_slice($URI->rsegments, 2));
}
}
@@ -273,6 +273,5 @@ if (class_exists('CI_DB') AND isset($CI->db))
}
-
/* End of file CodeIgniter.php */
/* Location: ./system/codeigniter/CodeIgniter.php */ \ No newline at end of file
diff --git a/system/codeigniter/Common.php b/system/codeigniter/Common.php
index d4c88c15f..8b80b42b1 100644
--- a/system/codeigniter/Common.php
+++ b/system/codeigniter/Common.php
@@ -39,18 +39,18 @@
*
* @access private
* @return void
- */
+ */
function is_really_writable($file)
{
if (is_dir($file))
{
$file = rtrim($file, '/').'/'.md5(rand(1,100));
-
+
if (($fp = @fopen($file, FOPEN_WRITE_CREATE)) === FALSE)
{
return FALSE;
}
-
+
fclose($fp);
@chmod($file, DIR_WRITE_MODE);
@unlink($file);
@@ -88,7 +88,7 @@ function &load_class($class, $instantiate = TRUE)
{
return $objects[$class];
}
-
+
// If the requested class does not exist in the application/libraries
// folder we'll load the native class from the system/libraries folder.
if (file_exists(APPPATH.'libraries/'.config_item('subclass_prefix').$class.EXT))
@@ -116,7 +116,7 @@ function &load_class($class, $instantiate = TRUE)
$objects[$class] = TRUE;
return $objects[$class];
}
-
+
if ($is_subclass == TRUE)
{
$name = config_item('subclass_prefix').$class;
@@ -139,16 +139,16 @@ function &load_class($class, $instantiate = TRUE)
function &get_config()
{
static $main_conf;
-
+
if (! isset($main_conf))
{
if (! file_exists(APPPATH.'config/config'.EXT))
{
exit('The configuration file config'.EXT.' does not exist.');
}
-
+
require(APPPATH.'config/config'.EXT);
-
+
if (! isset($config) OR ! is_array($config))
{
exit('Your config file does not appear to be formatted correctly.');
@@ -172,7 +172,7 @@ function config_item($item)
if (! isset($config_item[$item]))
{
$config =& get_config();
-
+
if (! isset($config[$item]))
{
return FALSE;
@@ -295,6 +295,6 @@ function _exception_handler($severity, $message, $filepath, $line)
}
-
-/* End of file Common.php */
+
+/* End of file Common.php */
/* Location: ./system/codeigniter/Common.php */ \ No newline at end of file