don't backup #DEL# factoids. asuffield.

git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk/blootbot@420 c11ca15a-4712-0410-83d8-924469b57eb5

diff --git a/src/Process.pl b/src/Process.pl
index 600729defdfcf8f423cb99adb1902574ca845679..5e59a021d4c70f4bd39f2d9a86ca090c5ef05d2d 100644 (file)
--- a/src/Process.pl
+++ b/src/Process.pl
@@ -401,14 +401,22 @@ sub FactoidStuff {
            return 'locked factoid' if (&IsLocked($faqtoid) == 1);
 
            if (&IsParam("factoidDeleteDelay")) {
+               if ($faqtoid =~ /#DEL#/ and !&IsFlag("o")) {
+                   &msg($who, "cannot delete it ($faqtoid).");
+                   return;
+               }
                &status("forgot (safe delete): <$who> '$faqtoid' =is=> '$result'");
                ### TODO: check if the "backup" exists and overwrite it
                my $check = &getFactoid("$faqtoid #DEL#");
                if (!$check) {
-                   &setFactInfo($faqtoid, "factoid_key", $faqtoid." #DEL#");
-
-                   &setFactInfo($faqtoid, "modified_by", $who);
-                   &setFactInfo($faqtoid, "modified_time", time());
+                   if ($faqtoid !~ /#DEL#/) {
+                       &setFactInfo($faqtoid, "factoid_key", $faqtoid." #DEL#");
+
+                       &setFactInfo($faqtoid, "modified_by", $who);
+                       &setFactInfo($faqtoid, "modified_time", time());
+                   } else {
+                       &status("not backing up $faqtoid.");
+                   }
                } else {
                    &status("forget: not overwriting backup!");
                }