Changeset 2310 for trunk/system/libraries/URI.php

Timestamp:

03/17/2008 04:40:35 AM (8 months ago)

Author:

Geert

Message:

Fixed #496 and some other small optimizations and cleanups.

Files:

• trunk/system/libraries/URI.php (modified) (1 diff)

trunk/system/libraries/URI.php

@@ -237 +237 @@
                 return self::$rsegments[$end - 1];
         }
-        
-        /** 
-         * Returns the path to the current controller (not including the actual 
-         * controller), as a web path
-         * 
-         * @param  bool    If a full url should be returned, or only the path specifically
-         */
-        public function controller_path($full = TRUE) {
-                return ((bool) $full) 
-                        ? url::site(self::$controller_path)
-                        : self::$controller_path;
-        }
-        
-        /** 
-         * Returns the current controller, as a web path 
-         * 
-         * @param  bool    If a full url should be returned, or only the controller specifically
-         */
-        public function controller($full = TRUE) {
-                return ((bool) $full) 
-                        ? url::site(self::$controller_path.self::$controller)
-                        : self::$controller;
-        }
-        
-        /** 
-         * Returns the current method, as a web path
-         * 
-         * @param  bool    If a full url should be returned, or only the method specifically
-         */
-        public function method($full = TRUE) {
-                return ((bool) $full) 
-                        ? url::site(self::$controller_path.self::$controller.'/'.self::$method) 
-                        : self::$method;
+
+        /**
+         * Returns the path to the current controller (not including the actual
+         * controller), as a web path.
+         *
+         * @param   boolean  return a full url, or only the path specifically
+         * @return  string
+         */
+        public function controller_path($full = TRUE)
+        {
+                return ($full) ? url::site(self::$controller_path) : self::$controller_path;
+        }
+
+        /**
+         * Returns the current controller, as a web path.
+         *
+         * @param   boolean  return a full url, or only the controller specifically
+         * @return  string
+         */
+        public function controller($full = TRUE)
+        {
+                return ($full) ? url::site(self::$controller_path.self::$controller) : self::$controller;
+        }
+
+        /**
+         * Returns the current method, as a web path.
+         *
+         * @param   boolean  return a full url, or only the method specifically
+         * @return  string
+         */
+        public function method($full = TRUE)
+        {
+                return ($full) ? url::site(self::$controller_path.self::$controller.'/'.self::$method) : self::$method;
         }