dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
30a2da8
)
Make WatchlistEditor::extractTitles() more robust when dealing with blank lines
author
Rob Church
<robchurch@users.mediawiki.org>
Wed, 4 Jul 2007 10:18:10 +0000
(10:18 +0000)
committer
Rob Church
<robchurch@users.mediawiki.org>
Wed, 4 Jul 2007 10:18:10 +0000
(10:18 +0000)
includes/WatchlistEditor.php
patch
|
blob
|
history
diff --git
a/includes/WatchlistEditor.php
b/includes/WatchlistEditor.php
index
a8974c0
..
915e7f2
100644
(file)
--- a/
includes/WatchlistEditor.php
+++ b/
includes/WatchlistEditor.php
@@
-84,17
+84,21
@@
class WatchlistEditor {
* @return array
*/
private function extractTitles( $list ) {
* @return array
*/
private function extractTitles( $list ) {
+ $titles = array();
if( !is_array( $list ) ) {
if( !is_array( $list ) ) {
- $list = explode( "\n",
$list
);
+ $list = explode( "\n",
trim( $list )
);
if( !is_array( $list ) )
return array();
}
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
;
}
/**
}
/**