From a08537335ae5d6ec39bebfe6119edfda067aba71 Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylorotwell@gmail.com>
Date: Sat, 25 Feb 2012 22:41:19 -0600
Subject: [PATCH] simplify autoloader namespace mapping.

Signed-off-by: Taylor Otwell <taylorotwell@gmail.com>
---
 laravel/autoloader.php | 25 +++++--------------------
 laravel/paginator.php  |  2 +-
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/laravel/autoloader.php b/laravel/autoloader.php
index 1e8726bc..5748c44a 100644
--- a/laravel/autoloader.php
+++ b/laravel/autoloader.php
@@ -56,14 +56,16 @@ class_alias(static::$aliases[$class], $class);
 			require static::$mappings[$class];
 		}
 
+		$namespace = root_namespace($class).'\\';
+
 		// If the class namespace is mapped to a directory, we will load the
 		// class using the PSR-0 standards from that directory accounting
 		// for the root of the namespace by trimming it.
-		if ( ! is_null($info = static::namespaced($class)))
+		if (isset(static::$namespaces[$namespace]))
 		{
-			$class = substr($class, strlen($info['namespace']));
+			$class = substr($class, strlen($namespace));
 
-			return static::load_psr($class, $info['directory']);
+			return static::load_psr($class, static::$namespaces[$namespace]);
 		}
 
 		static::load_psr($class);
@@ -103,23 +105,6 @@ protected static function load_psr($class, $directory = null)
 		}
 	}
 
-	/**
-	 * Get the directory for a given namespaced class.
-	 *
-	 * @param  string  $class
-	 * @return string
-	 */
-	protected static function namespaced($class)
-	{
-		foreach (static::$namespaces as $namespace => $directory)
-		{
-			if (starts_with($class, $namespace))
-			{
-				return compact('namespace', 'directory');
-			}
-		}
-	}
-
 	/**
 	 * Register an array of class to path mappings.
 	 *
diff --git a/laravel/paginator.php b/laravel/paginator.php
index a3176e67..264cd714 100644
--- a/laravel/paginator.php
+++ b/laravel/paginator.php
@@ -216,7 +216,7 @@ public function slider($adjacent = 3)
 		//
 		// Likewise, if the page is very close to the end, we will create the
 		// beginning of the slider, but just show the last several pages at
-		// the end of the slider.
+		// the end of the slider. Otherwise, we'll build the range.
 		//
 		// Example: 1 [2] 3 4 5 6 ... 23 24
 		if ($this->page <= $window)