* (bug 2173) Fatal error when removing an article with an empty title from

the watchlist

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 4529942..d5a2fa8 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -235,6 +235,8 @@ Various bugfixes, small features, and a few experimental things:
 * (bug 2275) Update search index more or less right on page move
 * (bug 2053) Move comment whitespace trimming from edit page to save;
   leaves the whitespace from the section comment there on preview.
+* (bug 2274) Respect stub threshold in category page list
+* (bug 2173) Fatal error when removing an article with an empty title from the watchlist
 
 
 === Caveats ===

diff --git a/includes/SpecialWatchlist.php b/includes/SpecialWatchlist.php
index f6833de..97093d0 100644 (file)
--- a/includes/SpecialWatchlist.php
+++ b/includes/SpecialWatchlist.php
@@ -50,7 +50,7 @@ function wfSpecialWatchlist( $par ) {
                $wgOut->addHTML( '<p>' );
                foreach($id as $one) {
                        $t = Title::newFromURL( $one );
-                       if($t->getDBkey() != '') {
+                       if( !is_null( $t ) ) {
                                $wl = WatchedItem::fromUserTitle( $wgUser, $t );
                                if( $wl->removeWatch() === false ) {
                                        $wgOut->addHTML( "<br />\n" . wfMsg( 'couldntremove', htmlspecialchars($one) ) );