MERGE: リビジョン1752のマージ。sql_close()を非推奨関数に。

メンテナンスを軽減するため、全く同じことを行うsql_disconnect()を使うように修正。

Revision 1752: CHANGE: sql_close() is deprecated. use sql_disconnect()
instead of this.
There are two ways to close SQL connection. Integration of them are good
to reduce the cost for maintaining.
http://nucleuscms.svn.sourceforge.net/viewvc/nucleuscms?view=revision&revision=1752

diff --git a/install/index.php b/install/index.php
index 1f93430..82c8dbc 100644 (file)
--- a/install/index.php
+++ b/install/index.php
@@ -1532,7 +1532,7 @@ class ParamManager
                        }\r
                        else\r
                        {\r
-                               @sql_close($mysql_conn);\r
+                               @sql_disconnect($mysql_conn);\r
                        }\r
                }\r
 \r

diff --git a/nucleus/libs/sql/mysql.php b/nucleus/libs/sql/mysql.php
index a1063a4..f24b14d 100644 (file)
--- a/nucleus/libs/sql/mysql.php
+++ b/nucleus/libs/sql/mysql.php
@@ -102,6 +102,14 @@ if ( function_exists('mysql_query') && !function_exists('sql_fetch_assoc') )
                @mysql_close($conn);\r
        }\r
        \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($conn = false)\r
        {\r
                global $MYSQL_CONN;\r
@@ -110,6 +118,7 @@ if ( function_exists('mysql_query') && !function_exists('sql_fetch_assoc') )
                        $conn = $MYSQL_CONN;\r
                }\r
                @mysql_close($conn);\r
+               return;
        }\r
        \r
        /**\r

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