Make WatchlistEditor::extractTitles() more robust when dealing with blank lines
authorRob Church <robchurch@users.mediawiki.org>
Wed, 4 Jul 2007 10:18:10 +0000 (10:18 +0000)
committerRob Church <robchurch@users.mediawiki.org>
Wed, 4 Jul 2007 10:18:10 +0000 (10:18 +0000)
includes/WatchlistEditor.php

index a8974c0..915e7f2 100644 (file)
@@ -84,17 +84,21 @@ class WatchlistEditor {
         * @return array
         */
        private function extractTitles( $list ) {
+               $titles = array();
                if( !is_array( $list ) ) {
-                       $list = explode( "\n", $list );
+                       $list = explode( "\n", trim( $list ) );
                        if( !is_array( $list ) )
                                return array();
                }
-               for( $i = 0; $i < count( $list ); $i++ ) {
-                       $list[$i] = Title::newFromText( $list[$i] );
-                       if( !$list[$i] instanceof Title )
-                               unset( $list[$i] );
+               foreach( $list as $text ) {
+                       $text = trim( $text );
+                       if( strlen( $text ) > 0 ) {
+                               $title = Title::newFromText( $text );
+                               if( $title instanceof Title )
+                                       $titles[] = $title;
+                       }
                }
-               return $list;
+               return $titles;
        }
        
        /**