OSDN Git Service
(root)
/
nucleus-jp
/
nucleus-next.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MERGE: リビジョン1752のマージ。sql_close()を非推奨関数に。
[nucleus-jp/nucleus-next.git]
/
nucleus
/
libs
/
sql
/
mysql.php
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
@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
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
$conn = $MYSQL_CONN;
\r
}
\r
@mysql_close($conn);
\r
+ return;
}
\r
\r
/**
\r
}
\r
\r
/**
\r