Aktualisierung auf MediaWiki 1.10.0

Plugins angepasst und verbessert
kleine Korrekturen am Design

1 files changed, 37 insertions, 36 deletions

diff --git a/includes/Categoryfinder.php b/includes/Categoryfinder.php
index a8cdf3ce..7faae935 100644
--- a/includes/Categoryfinder.php
+++ b/includes/Categoryfinder.php
@@ -1,26 +1,27 @@
 <?php
-/*
-The "Categoryfinder" class takes a list of articles, creates an internal representation of all their parent
-categories (as well as parents of parents etc.). From this representation, it determines which of these articles
-are in one or all of a given subset of categories.
-
-Example use :
-
-	# Determines wether the article with the page_id 12345 is in both
-	# "Category 1" and "Category 2" or their subcategories, respectively
-	
-	$cf = new Categoryfinder ;
-	$cf->seed (
-		array ( 12345 ) ,
-		array ( "Category 1","Category 2" ) ,
-		"AND"
-	) ;
-	$a = $cf->run() ;
-	print implode ( "," , $a ) ;
-
-*/
-
 
+/**
+ * The "Categoryfinder" class takes a list of articles, creates an internal
+ * representation of all their parent categories (as well as parents of
+ * parents etc.). From this representation, it determines which of these
+ * articles are in one or all of a given subset of categories.
+ *
+ * Example use :
+ * <code>
+ * 	# Determines whether the article with the page_id 12345 is in both
+ * 	# "Category 1" and "Category 2" or their subcategories, respectively
+ *
+ * 	$cf = new Categoryfinder ;
+ * 	$cf->seed (
+ * 		array ( 12345 ) ,
+ * 		array ( "Category 1","Category 2" ) ,
+ * 		"AND"
+ * 	) ;
+ * 	$a = $cf->run() ;
+ * 	print implode ( "," , $a ) ;
+ * </code>
+ *
+ */
 class Categoryfinder {
 
 	var $articles = array () ; # The original article IDs passed to the seed function
@@ -34,8 +35,8 @@ class Categoryfinder {
 
 	/**
 	 * Constructor (currently empty).
-	*/
-	function Categoryfinder () {
+	 */
+	function __construct() {
 	}
 
 	/**
@@ -61,10 +62,10 @@ class Categoryfinder {
 	/**
 	 * Iterates through the parent tree starting with the seed values,
 	 * then checks the articles if they match the conditions
-	 @return array of page_ids (those given to seed() that match the conditions)
-	*/
+	 * @return array of page_ids (those given to seed() that match the conditions)
+	 */
 	function run () {
-		$this->dbr =& wfGetDB( DB_SLAVE );
+		$this->dbr = wfGetDB( DB_SLAVE );
 		while ( count ( $this->next ) > 0 ) {
 			$this->scan_next_layer () ;
 		}
@@ -83,20 +84,20 @@ 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
-	 @return bool Does this match the conditions?
-	*/
+	 * @param $id The article/category to check
+	 * @param $conds The array of categories to match
+	 * @return bool Does this match the conditions?
+	 */
 	function check ( $id , &$conds ) {
 		# Shortcut (runtime paranoia): No contitions=all matched
 		if ( count ( $conds ) == 0 ) return true ;
-		
+
 		if ( !isset ( $this->parents[$id] ) ) return false ;
 
 		# iterate through the parents
 		foreach ( $this->parents[$id] AS $p ) {
 			$pname = $p->cl_to ;
-			
+
 			# Is this a condition?
 			if ( isset ( $conds[$pname] ) ) {
 				# This key is in the category list!
@@ -113,7 +114,7 @@ class Categoryfinder {
 					}
 				}
 			}
-			
+
 			# Not done yet, try sub-parents
 			if ( !isset ( $this->name2id[$pname] ) ) {
 				# No sub-parent
@@ -130,10 +131,10 @@ class Categoryfinder {
 
 	/**
 	 * Scans a "parent layer" of the articles/categories in $this->next
-	*/
+	 */
 	function scan_next_layer () {
 		$fname = "Categoryfinder::scan_next_layer" ;
-	
+
 		# Find all parents of the article currently in $this->next
 		$layer = array () ;
 		$res = $this->dbr->select(
@@ -161,7 +162,7 @@ class Categoryfinder {
 		$this->dbr->freeResult( $res ) ;
 
 		$this->next = array() ;
-		
+
 		# Find the IDs of all category pages in $layer, if they exist
 		if ( count ( $layer ) > 0 ) {
 			$res = $this->dbr->select(