Changeset 845

Timestamp:

10/18/2007 01:47:55 PM (14 months ago)

Author:

Geert

Message:

Integrated URI->label() into URI->segment()

Files:

• trunk/system/libraries/URI.php (modified) (3 diffs)

trunk/system/libraries/URI.php

@@ -41 +41 @@
          *
          * @access      public
-         * @param       integer
+         * @param       mixed
          * @param       mixed
          * @return      mixed
@@ -47 +47 @@
         public function segment($index = 1, $default = FALSE)
         {
+                if (is_string($index))
+                {
+                        if (($key = array_search($index, self::$segments)) === FALSE)
+                                return $default;
+
+                        $index = $key + 2;
+                }
+
                 $index = (int) $index - 1;
 
@@ -111 +119 @@
 
         /**
-         * Returns the URI segment that is preceded by a certain other segment (label)
-         *
-         * @access      public
-         * @param       string
-         * @param       mixed
-         * @return      mixed
-         */
-        public function label($label, $default = FALSE)
-        {
-                if (($key = array_search($label, self::$segments)) === FALSE)
-                        return $default;
-
-                return $this->segment($key + 2, $default);
-        }
-
-        /**
          * Returns the total number of URI segments
          *