Changeset 3383

Timestamp:

08/28/2008 03:22:02 PM (3 months ago)

Author:

Shadowhand

Message:

Follow up to r3366, fixes for ORM and Router

Location:

trunk/system/classes

Files:

• orm.php (modified) (2 diffs)
• router.php (modified) (2 diffs)

trunk/system/classes/orm.php

@@ -77 +77 @@
         {
                 // Set the object name
-                $this->object_name = strtolower(substr(get_class($this), 0, -6));
+                $this->object_name = strtolower(substr(get_class($this), 6));
 
                 // Initialize database
@@ -454 +454 @@
                 }
 
+                if ( ! isset($this->db_applied['orderby']))
+                {
+                        // Apply sorting
+                        $this->db->orderby($this->sorting);
+                }
+
                 return $this->load_result();
         }

trunk/system/classes/router.php

@@ -70 +70 @@
                         if (preg_match('#^'.$regex.'$#u', self::$current_uri, $matches))
                         {
+                                echo Kohana::debug($regex, $name);
+
                                 // If matches exist and there are keys for the URI, parse them
                                 if (count($matches) > 1 AND $keys = Router::keys($route[0]))
@@ -104 +106 @@
                                 }
 
+                                // Set controller name
+                                self::$controller = $route['controller'];
+
                                 if (isset($route['method']))
                                 {