From e67de3b0f741e199e408d9151fd6f4b07f531a64 Mon Sep 17 00:00:00 2001
From: ThinkPHP <thinkphp@qq.com>
Date: Sun, 14 Apr 2013 17:57:51 +0800
Subject: [PATCH] =?UTF-8?q?Loder=E7=B1=BB=E7=9A=84addMap=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=89=B9=E9=87=8F=E5=AF=BC=E5=85=A5=20?=
 =?UTF-8?q?=E5=BA=9F=E9=99=A4loadMap=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Think/Loader.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/Think/Loader.php b/Think/Loader.php
index 0dbcad0d..83707bf9 100644
--- a/Think/Loader.php
+++ b/Think/Loader.php
@@ -41,8 +41,12 @@ class Loader {
     }
 
     // 注册classmap
-    static public function addMap($class,$map){
-        self::$map[$class]  =   $map;
+    static public function addMap($class,$map=''){
+        if(is_array($class)){
+            self::$map  =   array_merge(self::$map,$class);
+        }else{
+            self::$map[$class]  =   $map;
+        }        
     }
 
     // 注册命名空间
@@ -50,11 +54,6 @@ class Loader {
         self::$namespace[$namespace]    =   $path;
     }
 
-    // 加载classmap
-    static public function loadMap($map){
-        self::$map  =   array_merge(self::$map,$map);
-    }
-
     // 注册自动加载机制
     static public function register($autoload=''){
         spl_autoload_register($autoload?$autoload:['Think\Loader','autoload']);