http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72491

Revision: 72491
Author:   werdna
Date:     2010-09-06 13:17:10 +0000 (Mon, 06 Sep 2010)

Log Message:
-----------
Re-commit r72489, just the relevant parts

Modified Paths:
--------------
    trunk/extensions/LiquidThreads/classes/Thread.php

Modified: trunk/extensions/LiquidThreads/classes/Thread.php
===================================================================
--- trunk/extensions/LiquidThreads/classes/Thread.php   2010-09-06 13:05:45 UTC 
(rev 72490)
+++ trunk/extensions/LiquidThreads/classes/Thread.php   2010-09-06 13:17:10 UTC 
(rev 72491)
@@ -324,9 +324,9 @@
        }
 
        function delete( $reason, $commit = true ) {
-       
+               $this->type = Threads::TYPE_DELETED;
+               
                if ( $commit ) {
-                       $this->type = Threads::TYPE_DELETED;
                        $this->commitRevision( Threads::CHANGE_DELETED, $this, 
$reason );
                }
                /* Mark thread as read by all users, or we get blank thingies 
in New Messages. */
@@ -1158,7 +1158,11 @@
                        }
 
                        if ( !$title && $this->type() != Threads::TYPE_DELETED 
) {
-                               $this->delete('', false /* !commit */);
+                               if ( ! $this->isHistorical() ) {
+                                       $this->delete('', false /* !commit */);
+                               } else {
+                                       $this->type = Threads::TYPE_DELETED;
+                               }
                        }
                        
                        if ( !$title ) {



_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to