return after loading mapped class in autoloader.

dcrawkstar · Apr 10, 2012 · 60b5e38 · 60b5e38
1 parent b7ac1b7
commit 60b5e38
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/changes.md b/changes.md
@@ -2,6 +2,8 @@
 
 ## Contents
 
+- [Laravel 3.1.7](#3.1.7)
+- [Upgrading From 3.1.6](#upgrade-3.1.7)
 - [Laravel 3.1.6](#3.1.6)
 - [Upgrading From 3.1.5](#upgrade-3.1.6)
 - [Laravel 3.1.5](#3.1.5)
@@ -17,6 +19,14 @@
 - [Laravel 3.1](#3.1)
 - [Upgrading From 3.0](#upgrade-3.1)
 
+<a name="3.1.7"></a>
+## Laravel 3.1.7
+
+- Fixes custom validation language line loading from bundles.
+- Fixes double-loading of classes when overriding the core.
+- Classify migration names.
+- 
+
 <a name="3.1.6"></a>
 ## Laravel 3.1.6
 

diff --git a/laravel/autoloader.php b/laravel/autoloader.php
@@ -61,6 +61,8 @@ class_alias(static::$aliases[$class], $class);
 		elseif (isset(static::$mappings[$class]))
 		{
 			require static::$mappings[$class];
+
+			return;
 		}
 
 		// If the class namespace is mapped to a directory, we will load the
-Original file line number
+Diff line change
@@ Expand Up / @@ -61,6 +61,8 @@ class_alias(static::$aliases[$class], $class); @@
     		elseif (isset(static::$mappings[$class]))
     		{
     			require static::$mappings[$class];
+    			return;
     		}
     		// If the class namespace is mapped to a directory, we will load the
@@ Expand Down @@