Browse Source

return after loading mapped class in autoloader.

Taylor Otwell 12 years ago
parent
commit
60b5e38ca0
2 changed files with 12 additions and 0 deletions
  1. 10 0
      changes.md
  2. 2 0
      laravel/autoloader.php

+ 10 - 0
changes.md

@@ -2,6 +2,8 @@
 
 
 ## Contents
 ## Contents
 
 
+- [Laravel 3.1.7](#3.1.7)
+- [Upgrading From 3.1.6](#upgrade-3.1.7)
 - [Laravel 3.1.6](#3.1.6)
 - [Laravel 3.1.6](#3.1.6)
 - [Upgrading From 3.1.5](#upgrade-3.1.6)
 - [Upgrading From 3.1.5](#upgrade-3.1.6)
 - [Laravel 3.1.5](#3.1.5)
 - [Laravel 3.1.5](#3.1.5)
@@ -17,6 +19,14 @@
 - [Laravel 3.1](#3.1)
 - [Laravel 3.1](#3.1)
 - [Upgrading From 3.0](#upgrade-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>
 <a name="3.1.6"></a>
 ## Laravel 3.1.6
 ## Laravel 3.1.6
 
 

+ 2 - 0
laravel/autoloader.php

@@ -61,6 +61,8 @@ class Autoloader {
 		elseif (isset(static::$mappings[$class]))
 		elseif (isset(static::$mappings[$class]))
 		{
 		{
 			require static::$mappings[$class];
 			require static::$mappings[$class];
+
+			return;
 		}
 		}
 
 
 		// If the class namespace is mapped to a directory, we will load the
 		// If the class namespace is mapped to a directory, we will load the