r23696 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r23695‎ | r23696 | r23697 >
Date:10:18, 4 July 2007
Author:robchurch
Status:old
Tags:
Comment:
Make WatchlistEditor::extractTitles() more robust when dealing with blank lines
Modified paths:
  • /trunk/phase3/includes/WatchlistEditor.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/WatchlistEditor.php
@@ -84,17 +84,21 @@
8585 * @return array
8686 */
8787 private function extractTitles( $list ) {
 88+ $titles = array();
8889 if( !is_array( $list ) ) {
89 - $list = explode( "\n", $list );
 90+ $list = explode( "\n", trim( $list ) );
9091 if( !is_array( $list ) )
9192 return array();
9293 }
93 - for( $i = 0; $i < count( $list ); $i++ ) {
94 - $list[$i] = Title::newFromText( $list[$i] );
95 - if( !$list[$i] instanceof Title )
96 - unset( $list[$i] );
 94+ foreach( $list as $text ) {
 95+ $text = trim( $text );
 96+ if( strlen( $text ) > 0 ) {
 97+ $title = Title::newFromText( $text );
 98+ if( $title instanceof Title )
 99+ $titles[] = $title;
 100+ }
97101 }
98 - return $list;
 102+ return $titles;
99103 }
100104
101105 /**

Follow-up revisions

RevisionCommit summaryAuthorDate
r23912Merged revisions 23662-23909 via svnmerge from...david18:11, 9 July 2007

Status & tagging log