MERGE: リビジョン1787。Adminクラスのいくつかのメソッドのコード整理。

[nucleus-jp/nucleus-next.git] / nucleus / libs / sql / pdo.php

diff --git a/nucleus/libs/sql/pdo.php b/nucleus/libs/sql/pdo.php
index 22cf8ba..56c351c 100644 (file)
--- a/nucleus/libs/sql/pdo.php
+++ b/nucleus/libs/sql/pdo.php
@@ -245,10 +245,26 @@ if (!function_exists('sql_fetch_assoc'))
                else $dbh = NULL;\r
        }\r
        \r
-       function sql_close(&$dbh=NULL) {\r
+       /**\r
+        * sql_close()\r
+        * use sql_disconnect() instead of this\r
+        * \r
+        * @deprecated\r
+        * @param       resource        $conn   resource of mySQL connection\r
+        * @return      void\r
+        */\r
+       function sql_close(&$dbh=NULL)\r
+       {\r
                global $SQL_DBH;\r
-               if (is_null($dbh)) $SQL_DBH = NULL;\r
-               else $dbh = NULL;\r
+               if ( is_null($dbh) )\r
+               {\r
+                       $SQL_DBH = NULL;\r
+               }\r
+               else\r
+               {\r
+                       $dbh = NULL;\r
+               }\r
+               return;\r
        }\r
        \r
        /**\r