From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Tue, 20 Sep 2011 08:39:29 +0000 (+0000)
Subject: Moved PatrolLog to logging folder, sorted the autoloaded entries alphabetically
X-Git-Tag: 1.31.0-rc.0~27539
X-Git-Url: http://git.cyclocoop.org/%22%2C%20generer_url_ecrire%28?a=commitdiff_plain;h=f2553a0c58a27285957d722bb47046abccd4902a;p=lhc%2Fweb%2Fwiklou.git

Moved PatrolLog to logging folder, sorted the autoloaded entries alphabetically
---

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index ae09c7e24b..1f2d1110e4 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -164,7 +164,6 @@ $wgAutoloadLocalClasses = array(
 	'PageQueryPage' => 'includes/PageQueryPage.php',
 	'Pager' => 'includes/Pager.php',
 	'PasswordError' => 'includes/User.php',
-	'PatrolLog' => 'includes/PatrolLog.php',
 	'PermissionsError' => 'includes/Exception.php',
 	'PhpHttpRequest' => 'includes/HttpFunctions.php',
 	'PoolCounter' => 'includes/PoolCounter.php',
@@ -538,16 +537,17 @@ $wgAutoloadLocalClasses = array(
 	'JSParser' => 'includes/libs/jsminplus.php',
 
 	# includes/logging
+	'DatabaseLogEntry' => 'includes/logging/LogEntry.php',
+	'DeleteLogFormatter' => 'includes/logging/LogFormatter.php',
+	'LegacyLogFormatter' => 'includes/logging/LogFormatter.php',
 	'LogEntry' => 'includes/logging/LogEntry.php',
 	'LogEntryBase' => 'includes/logging/LogEntry.php',
-	'DatabaseLogEntry' => 'includes/logging/LogEntry.php',
-	'RCDatabaseLogEntry' => 'includes/logging/LogEntry.php',
-	'ManualLogEntry' => 'includes/logging/LogEntry.php',
 	'LogFormatter' => 'includes/logging/LogFormatter.php',
-	'LegacyLogFormatter' => 'includes/logging/LogFormatter.php',
-	'DeleteLogFormatter' => 'includes/logging/LogFormatter.php',
+	'ManualLogEntry' => 'includes/logging/LogEntry.php',
 	'MoveLogFormatter' => 'includes/logging/LogFormatter.php',
+	'PatrolLog' => 'includes/logging/PatrolLog.php',
 	'PatrolLogFormatter' => 'includes/logging/LogFormatter.php',
+	'RCDatabaseLogEntry' => 'includes/logging/LogEntry.php',
 
 	# includes/media
 	'BitmapHandler' => 'includes/media/Bitmap.php',
diff --git a/includes/PatrolLog.php b/includes/PatrolLog.php
deleted file mode 100644
index 04fdc4f2a6..0000000000
--- a/includes/PatrolLog.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * Class containing static functions for working with
- * logs of patrol events
- *
- * @author Rob Church <robchur@gmail.com>
- * @author Niklas Laxström
- */
-class PatrolLog {
-
-	/**
-	 * Record a log event for a change being patrolled
-	 *
-	 * @param $rc Mixed: change identifier or RecentChange object
-	 * @param $auto Boolean: was this patrol event automatic?
-	 *
-	 * @return bool
-	 */
-	public static function record( $rc, $auto = false ) {
-		if ( !$rc instanceof RecentChange ) {
-			$rc = RecentChange::newFromId( $rc );
-			if ( !is_object( $rc ) ) {
-				return false;
-			}
-		}
-
-		$title = Title::makeTitleSafe( $rc->getAttribute( 'rc_namespace' ), $rc->getAttribute( 'rc_title' ) );
-		if( $title ) {
-			$entry = new ManualLogEntry( 'patrol', 'patrol' );
-			$entry->setTarget( $title );
-			$entry->setParameters( self::buildParams( $rc, $auto ) );
-			$entry->setPerformer( User::newFromName( $rc->getAttribute( 'rc_user_text' ), false ) );
-			$logid = $entry->insert();
-			if ( !$auto ) {
-				$entry->publish( $logid, 'udp' );
-			}
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Prepare log parameters for a patrolled change
-	 *
-	 * @param $change RecentChange to represent
-	 * @param $auto Boolean: whether the patrol event was automatic
-	 * @return Array
-	 */
-	private static function buildParams( $change, $auto ) {
-		return array(
-			'4::curid' => $change->getAttribute( 'rc_this_oldid' ),
-			'5::previd' => $change->getAttribute( 'rc_last_oldid' ),
-			'6::auto' => (int)$auto
-		);
-	}
-
-}
diff --git a/includes/logging/PatrolLog.php b/includes/logging/PatrolLog.php
new file mode 100644
index 0000000000..04fdc4f2a6
--- /dev/null
+++ b/includes/logging/PatrolLog.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * Class containing static functions for working with
+ * logs of patrol events
+ *
+ * @author Rob Church <robchur@gmail.com>
+ * @author Niklas Laxström
+ */
+class PatrolLog {
+
+	/**
+	 * Record a log event for a change being patrolled
+	 *
+	 * @param $rc Mixed: change identifier or RecentChange object
+	 * @param $auto Boolean: was this patrol event automatic?
+	 *
+	 * @return bool
+	 */
+	public static function record( $rc, $auto = false ) {
+		if ( !$rc instanceof RecentChange ) {
+			$rc = RecentChange::newFromId( $rc );
+			if ( !is_object( $rc ) ) {
+				return false;
+			}
+		}
+
+		$title = Title::makeTitleSafe( $rc->getAttribute( 'rc_namespace' ), $rc->getAttribute( 'rc_title' ) );
+		if( $title ) {
+			$entry = new ManualLogEntry( 'patrol', 'patrol' );
+			$entry->setTarget( $title );
+			$entry->setParameters( self::buildParams( $rc, $auto ) );
+			$entry->setPerformer( User::newFromName( $rc->getAttribute( 'rc_user_text' ), false ) );
+			$logid = $entry->insert();
+			if ( !$auto ) {
+				$entry->publish( $logid, 'udp' );
+			}
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Prepare log parameters for a patrolled change
+	 *
+	 * @param $change RecentChange to represent
+	 * @param $auto Boolean: whether the patrol event was automatic
+	 * @return Array
+	 */
+	private static function buildParams( $change, $auto ) {
+		return array(
+			'4::curid' => $change->getAttribute( 'rc_this_oldid' ),
+			'5::previd' => $change->getAttribute( 'rc_last_oldid' ),
+			'6::auto' => (int)$auto
+		);
+	}
+
+}