Changeset 648 for trunk/system/libraries/Loader.php

Timestamp:

10/04/2007 03:32:31 PM (14 months ago)

Author:

Shadowhand

Message:

Updated Input, replacing xss_clean() with a function by Christian Stocker. This function is blazing fast and does most of the right stuff.

Other changes are spit shine.

Files:

• trunk/system/libraries/Loader.php (modified) (6 diffs)

trunk/system/libraries/Loader.php

@@ -35 +35 @@
         public function library($name, $config = array())
         {
+                if (isset(Kohana::instance()->$name))
+                        return FALSE;
+
                 Kohana::instance()->$name = Kohana::load_class(ucfirst($name), $config);
         }
@@ -40 +43 @@
         public function database($group = 'default', $return = FALSE)
         {
+                // Return the new database object
                 if ($return == TRUE)
                 {
@@ -46 +50 @@
                 else
                 {
+                        // Set the database object to Controller->db
                         Kohana::instance()->db = new Database($group);
                 }
@@ -52 +57 @@
         public function helper($name)
         {
+                // Allow recursive loading
                 if (is_array($name))
                 {
@@ -69 +75 @@
         public function model($name, $alias = FALSE)
         {
+                // The alias is used for Controller->alias
                 $alias = ($alias == FALSE) ? $name : $alias;
+
+                if (isset(Kohana::instance()->$alias))
+                        return FALSE;
+
+                // Load the model
                 Kohana::instance()->$alias = Kohana::load_class(ucfirst($name).'_Model');
+
+                // Load Database into the DB
                 Kohana::instance()->$alias->db = (isset(Kohana::instance()->db)) ? Kohana::instance()->db : new Database('default');
         }
@@ -76 +90 @@
         public function view($name, $data = array())
         {
+                // Fancy! *wink*
                 return new View($name, $data);
         }