From 2602e1622b38505836f0468837a11dc0e3780c2f Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Sat, 30 Mar 2013 13:30:55 +0800
Subject: [PATCH] =?UTF-8?q?Model=E7=B1=BB=E5=AE=9E=E4=BE=8B=E5=8C=96Db?=
 =?UTF-8?q?=E7=B1=BB=E7=9A=84=E6=96=B9=E6=B3=95=E6=94=B9=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Think/Db.php    | 4 ++--
 Think/Model.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Think/Db.php b/Think/Db.php
index 6774fdb8..2ee97235 100644
--- a/Think/Db.php
+++ b/Think/Db.php
@@ -35,12 +35,12 @@ class Db {
             $class  =   $lite?  'Think\Db\Lite' :   'Think\\Db\\Driver\\'.ucwords($options['dbms']);
             if(class_exists($class)) {
                 self::$instance[$md5]   =   new $class($options);
-                self::$_instance        =   self::$instance[$md5];
             }else{
                 Error::halt('_DB_TYPE_INVALID_:'.$options['dbms']);
             }
         }
-        return self::$instance[$md5];
+        self::$_instance    =   self::$instance[$md5];
+        return self::$_instance;
     }
 
     /**
diff --git a/Think/Model.php b/Think/Model.php
index 5dc1410b..11af7641 100644
--- a/Think/Model.php
+++ b/Think/Model.php
@@ -781,7 +781,7 @@ class Model {
             if(!empty($config) && is_string($config) && false === strpos($config,'/')) { // 支持读取配置参数
                 $config  =  Config::get($config);
             }
-            $_db[$linkNum]            =    Db::getInstance($config);
+            $_db[$linkNum]            =    Db::instance($config);
         }elseif(NULL === $config){
             $_db[$linkNum]->close(); // 关闭数据库连接
             unset($_db[$linkNum]);