. $collation;\r
}\r
// </add for garble measure>*/\r
- sql_query($sql) or _doError(_ERROR16 . ': ' . sql_error());\r
+ sql_query($sql,$MYSQL_CONN) or _doError(_ERROR16 . ': ' . sql_error($MYSQL_CONN));\r
}\r
\r
// 4. try to select database\r
- sql_select_db($mysql_database) or _doError(_ERROR17);\r
+ sql_select_db($mysql_database,$MYSQL_CONN) or _doError(_ERROR17);\r
\r
// 5. execute queries\r
$filename = 'install.sql';\r
}\r
// </add for garble measure>*/\r
\r
- sql_query($query) or _doError(_ERROR30 . ' (<small>' . htmlspecialchars($query) . '</small>): ' . sql_error() );\r
+ sql_query($query,$MYSQL_CONN) or _doError(_ERROR30 . ' (<small>' . htmlspecialchars($query) . '</small>): ' . sql_error($MYSQL_CONN) );\r
}\r
}\r
\r
. " '" . $itm_body . "',"\r
. " '" . $itm_more . "',"\r
. " 1, 1, '2005-08-15 11:04:26', 0, 0, 0, 1, 0, 1);";\r
- sql_query($newpost) or _doError(_ERROR18 . ' (<small>' . htmlspecialchars($newpost) . '</small>): ' . sql_error() );\r
+ sql_query($newpost,$MYSQL_CONN) or _doError(_ERROR18 . ' (<small>' . htmlspecialchars($newpost) . '</small>): ' . sql_error($MYSQL_CONN) );\r
\r
// 6. update global settings\r
updateConfig('IndexURL', $config_indexurl);\r
. " WHERE"\r
. " mnumber = 1";\r
\r
- sql_query($query) or _doError(_ERROR19 . ': ' . sql_error() );\r
+ sql_query($query,$MYSQL_CONN) or _doError(_ERROR19 . ': ' . sql_error($MYSQL_CONN) );\r
\r
// 8. update weblog settings\r
$query = 'UPDATE ' . tableName('nucleus_blog')\r
. " WHERE"\r
. " bnumber = 1";\r
\r
- sql_query($query) or _doError(_ERROR20 . ': ' . sql_error() );\r
+ sql_query($query,$MYSQL_CONN) or _doError(_ERROR20 . ': ' . sql_error($MYSQL_CONN) );\r
\r
// 8-2. update category settings\r
if ($charset == 'ujis') {\r
. " WHERE"\r
. " catid = 1";\r
\r
- sql_query($query) or _doError(_ERROR20 . ': ' . sql_error() );\r
+ sql_query($query,$MYSQL_CONN) or _doError(_ERROR20 . ': ' . sql_error($MYSQL_CONN) );\r
\r
// 9. update item date\r
$query = 'UPDATE ' . tableName('nucleus_item')\r
. " SET itime = '" . date('Y-m-d H:i:s', time() ) ."'"\r
. " WHERE inumber = 1";\r
\r
- sql_query($query) or _doError(_ERROR21 . ': ' . sql_error() );\r
+ sql_query($query,$MYSQL_CONN) or _doError(_ERROR21 . ': ' . sql_error($MYSQL_CONN) );\r
\r
global $aConfPlugsToInstall, $aConfSkinsToImport;\r
$aSkinErrors = array();\r
$DIR_LIBS = $DIR_NUCLEUS . 'libs/';\r
\r
// close database connection (needs to be closed if we want to include globalfunctions.php)\r
- sql_close();\r
+ sql_close($MYSQL_CONN);\r
\r
$manager = '';\r
include_once($DIR_LIBS . 'globalfunctions.php');\r
$config_data .= " \$MYSQL_PREFIX = '" . (($mysql_usePrefix == 1) ? $mysql_prefix : '') . "';\n";\r
$config_data .= " // new in 3.50. first element is db handler, the second is the db driver used by the handler\n";\r
$config_data .= " // default is \$MYSQL_HANDLER = array('mysql','mysql');\n";\r
- $config_data .= " \$MYSQL_HANDLER = array('mysql','mysql');\n";\r
+ $config_data .= " //\$MYSQL_HANDLER = array('mysql','mysql');\n";\r
$config_data .= " //\$MYSQL_HANDLER = array('pdo','mysql');\n";\r
+ $config_data .= " \$MYSQL_HANDLER = array('".$MYSQL_HANDLER[0]."','".$MYSQL_HANDLER[1]."');\n";\r
$config_data .= "\n";\r
$config_data .= " // main nucleus directory\n";\r
$config_data .= " \$DIR_NUCLEUS = '" . $config_adminpath . "';\n";\r
}\r
\r
function updateConfig($name, $val) {\r
+ global $MYSQL_CONN;\r
$name = addslashes($name);\r
$val = trim(addslashes($val) );\r
\r
. " SET value = '$val'"\r
. " WHERE name = '$name'";\r
\r
- sql_query($query) or _doError(_ERROR26 . ': ' . mysql_error() );\r
- return sql_insert_id();\r
+ sql_query($query,$MYSQL_CONN) or _doError(_ERROR26 . ': ' . mysql_error($MYSQL_CONN) );\r
+ return sql_insert_id($MYSQL_CONN);\r
}\r
\r
function replaceDoubleBackslash($input) {\r