NobuNobu
nobun****@users*****
2007年 4月 30日 (月) 16:50:48 JST
Index: xoops2jp/html/class/smarty/core/core.write_file.php diff -u xoops2jp/html/class/smarty/core/core.write_file.php:1.2 xoops2jp/html/class/smarty/core/core.write_file.php:1.2.8.1 --- xoops2jp/html/class/smarty/core/core.write_file.php:1.2 Mon May 1 11:37:25 2006 +++ xoops2jp/html/class/smarty/core/core.write_file.php Mon Apr 30 16:50:48 2007 @@ -23,8 +23,7 @@ smarty_core_create_dir_structure($_params, $smarty); } - // write to tmp file, then rename it to avoid - // file locking race condition + // write to tmp file, then rename it to avoid file locking race condition $_tmp_file = tempnam($_dirname, 'wrt'); if (!($fd = @fopen($_tmp_file, 'wb'))) { @@ -38,12 +37,13 @@ fwrite($fd, $params['contents']); fclose($fd); - // Delete the file if it allready exists (this is needed on Win, - // because it cannot overwrite files with rename() - if (file_exists($params['filename'])) { + if (PHP_OS == 'Windows' || !@rename($_tmp_file, $params['filename'])) { + // On platforms and filesystems that cannot overwrite with rename() + // delete the file before renaming it -- because windows always suffers + // this, it is short-circuited to avoid the initial rename() attempt @unlink($params['filename']); + @rename($_tmp_file, $params['filename']); } - @rename($_tmp_file, $params['filename']); @chmod($params['filename'], $smarty->_file_perms); return true; @@ -51,4 +51,4 @@ /* vim: set expandtab: */ -?> +?> \ No newline at end of file Index: xoops2jp/html/class/smarty/core/index.html diff -u /dev/null xoops2jp/html/class/smarty/core/index.html:1.1.4.1 --- /dev/null Mon Apr 30 16:50:48 2007 +++ xoops2jp/html/class/smarty/core/index.html Mon Apr 30 16:50:48 2007 @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file