Changeset 2627

Timestamp:

05/05/08 10:59:39 (4 months ago)

Author:

Shadowhand

Message:

Follow up to r2623

Location:

trunk/system

Files:

• core/Bootstrap.php (modified) (3 diffs)
• core/Config.php (modified) (1 diff)
• libraries/Input.php (modified) (1 diff)
• libraries/Session.php (modified) (1 diff)

trunk/system/core/Bootstrap.php

@@ -17 +17 @@
 define('KOHANA_IS_WIN', PHP_SHLIB_SUFFIX === 'dll');
 
-// Kohana benchmarks are prefixed by a random string to prevent collisions
-define('SYSTEM_BENCHMARK', uniqid());
+// Kohana benchmarks are prefixed to prevent collisions
+define('SYSTEM_BENCHMARK', 'system_benchmark');
 
 // Load benchmarking support
@@ -45 +45 @@
 Benchmark::start(SYSTEM_BENCHMARK.'_system_initialization');
 
+// Prepare the system
 Event::run('system.ready');
+
+// Determine routing
 Event::run('system.routing');
 
@@ -51 +54 @@
 Benchmark::stop(SYSTEM_BENCHMARK.'_system_initialization');
 
+// Make the magic happen!
 Event::run('system.execute');
+
+// Clean up and exit
 Event::run('system.shutdown');

trunk/system/core/Config.php

@@ -57 +57 @@
 
         // Get the value of the key string
-        $value = Kohana::key_string($key, self::$conf);
+        $value = Kohana::key_string(self::$conf, $key);
 
         return

trunk/system/libraries/Input.php

@@ -156 +156 @@
         $return_array = (count($args) > 1);
 
-        // Compose the data to return
         $data = array();
         while ($key = array_shift($args))

trunk/system/libraries/Session.php

@@ -407 +407 @@
             return $_SESSION;
 
-        $result = isset($_SESSION[$key]) ? $_SESSION[$key] : Kohana::key_string($key, $_SESSION);
+        $result = isset($_SESSION[$key]) ? $_SESSION[$key] : Kohana::key_string($_SESSION, $key);
 
         return ($result === NULL) ? $default : $result;