dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Localisation updates for core messages from translatewiki.net (2009-06-15 07:42 UTC)
[lhc/web/wiklou.git]
/
includes
/
Categoryfinder.php
diff --git
a/includes/Categoryfinder.php
b/includes/Categoryfinder.php
index
d28f2ee
..
7c1c285
100644
(file)
--- a/
includes/Categoryfinder.php
+++ b/
includes/Categoryfinder.php
@@
-53,9
+53,11
@@
class Categoryfinder {
# Set the list of target categories; convert them to DBKEY form first
$this->targets = array () ;
foreach ( $categories AS $c ) {
# Set the list of target categories; convert them to DBKEY form first
$this->targets = array () ;
foreach ( $categories AS $c ) {
- $ct = Title::newFromText ( $c , NS_CATEGORY ) ;
- $c = $ct->getDBkey () ;
- $this->targets[$c] = $c ;
+ $ct = Title::makeTitleSafe( NS_CATEGORY, $c );
+ if( $ct ) {
+ $c = $ct->getDBkey();
+ $this->targets[$c] = $c;
+ }
}
}
}
}
@@
-86,9
+88,15
@@
class Categoryfinder {
* This functions recurses through the parent representation, trying to match the conditions
* @param $id The article/category to check
* @param $conds The array of categories to match
* This functions recurses through the parent representation, trying to match the conditions
* @param $id The article/category to check
* @param $conds The array of categories to match
+ * @param $path used to check for recursion loops
* @return bool Does this match the conditions?
*/
* @return bool Does this match the conditions?
*/
- function check ( $id , &$conds ) {
+ function check ( $id , &$conds, $path=array() ) {
+ // Check for loops and stop!
+ if( in_array( $id, $path ) )
+ return false;
+ $path[] = $id;
+
# Shortcut (runtime paranoia): No contitions=all matched
if ( count ( $conds ) == 0 ) return true ;
# Shortcut (runtime paranoia): No contitions=all matched
if ( count ( $conds ) == 0 ) return true ;
@@
-120,7
+128,7
@@
class Categoryfinder {
# No sub-parent
continue ;
}
# No sub-parent
continue ;
}
- $done = $this->check ( $this->name2id[$pname] , $conds
)
;
+ $done = $this->check ( $this->name2id[$pname] , $conds
, $path )
;
if ( $done OR count ( $conds ) == 0 ) {
# Subparents have done it!
return true ;
if ( $done OR count ( $conds ) == 0 ) {
# Subparents have done it!
return true ;