BugTrack/449: ATTACH_DELETE_ADMIN_NOBACKUPフラグ(TRUE:管理者削除のときはバックアップを作らない)を新設

diff --git a/plugin/attach.inc.php b/plugin/attach.inc.php
index 2b0c8b9..c5c20a1 100644 (file)
--- a/plugin/attach.inc.php
+++ b/plugin/attach.inc.php
@@ -2,7 +2,7 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-//  $Id: attach.inc.php,v 1.31 2003/07/27 14:15:29 arino Exp $
+//  $Id: attach.inc.php,v 1.32 2003/09/03 01:50:21 arino Exp $
 //
 
 /*
@@ -28,6 +28,9 @@ define('MAX_FILESIZE',1000000);
 define('ATTACH_UPLOAD_ADMIN_ONLY',FALSE); // FALSE or TRUE
 // ´ÉÍý¼Ô¤À¤±¤¬ÅºÉÕ¥Õ¥¡¥¤¥ë¤òºï½ü¤Ç¤­¤ë¤è¤¦¤Ë¤¹¤ë
 define('ATTACH_DELETE_ADMIN_ONLY',FALSE); // FALSE or TRUE
+// ´ÉÍý¼Ô¤¬ÅºÉÕ¥Õ¥¡¥¤¥ë¤òºï½ü¤¹¤ë¤È¤­¤Ï¡¢¥Ð¥Ã¥¯¥¢¥Ã¥×¤òºî¤é¤Ê¤¤
+// ATTACH_DELETE_ADMIN_ONLY=TRUE¤Î¤È¤­Í­¸ú
+define('ATTACH_DELETE_ADMIN_NOBACKUP',FALSE); // FALSE or TRUE
 
 // ¥¢¥Ã¥×¥í¡¼¥É/ºï½ü»þ¤Ë¥Ñ¥¹¥ï¡¼¥É¤òÍ׵᤹¤ë(ADMIN_ONLY¤¬Í¥Àè)
 define('ATTACH_PASSWORD_REQUIRE',FALSE); // FALSE or TRUE
@@ -553,7 +556,8 @@ EOD;
                        }
                }
                //¥Ð¥Ã¥¯¥¢¥Ã¥×
-               if ($this->age)
+               if ($this->age or
+                       (ATTACH_DELETE_ADMIN_ONLY and ATTACH_DELETE_ADMIN_NOBACKUP))
                {
                        @unlink($this->filename);
                }