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
Merge "Call resetServices() when setting globals in tests"
[lhc/web/wiklou.git]
/
includes
/
CategoryFinder.php
diff --git
a/includes/CategoryFinder.php
b/includes/CategoryFinder.php
index
7446b59
..
01427a2
100644
(file)
--- a/
includes/CategoryFinder.php
+++ b/
includes/CategoryFinder.php
@@
-58,7
+58,7
@@
class CategoryFinder {
/** @var array Array of article/category IDs */
protected $next = [];
/** @var array Array of article/category IDs */
protected $next = [];
- /** @var int Max layer depth *
*
/
+ /** @var int Max layer depth */
protected $maxdepth = -1;
/** @var array Array of DBKEY category names */
protected $maxdepth = -1;
/** @var array Array of DBKEY category names */
@@
-213,14
+213,14
@@
class CategoryFinder {
/* WHERE */ [ 'cl_from' => $this->next ],
__METHOD__ . '-1'
);
/* WHERE */ [ 'cl_from' => $this->next ],
__METHOD__ . '-1'
);
- foreach ( $res as $
o
) {
- $k = $
o
->cl_to;
+ foreach ( $res as $
row
) {
+ $k = $
row
->cl_to;
# Update parent tree
# Update parent tree
- if ( !isset( $this->parents[$
o
->cl_from] ) ) {
- $this->parents[$
o
->cl_from] = [];
+ if ( !isset( $this->parents[$
row
->cl_from] ) ) {
+ $this->parents[$
row
->cl_from] = [];
}
}
- $this->parents[$
o->cl_from][$k] = $o
;
+ $this->parents[$
row->cl_from][$k] = $row
;
# Ignore those we already have
if ( in_array( $k, $this->deadend ) ) {
# Ignore those we already have
if ( in_array( $k, $this->deadend ) ) {
@@
-245,9
+245,9
@@
class CategoryFinder {
/* WHERE */ [ 'page_namespace' => NS_CATEGORY, 'page_title' => $layer ],
__METHOD__ . '-2'
);
/* WHERE */ [ 'page_namespace' => NS_CATEGORY, 'page_title' => $layer ],
__METHOD__ . '-2'
);
- foreach ( $res as $
o
) {
- $id = $
o
->page_id;
- $name = $
o
->page_title;
+ foreach ( $res as $
row
) {
+ $id = $
row
->page_id;
+ $name = $
row
->page_title;
$this->name2id[$name] = $id;
$this->next[] = $id;
unset( $layer[$name] );
$this->name2id[$name] = $id;
$this->next[] = $id;
unset( $layer[$name] );