X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fchanges%2FEnhancedChangesList.php;h=df60f021b0a8d6be0668f0f333c17b31546c5571;hb=c2665e4b6e615c80e4126f1ff343e7f9f3018dcc;hp=99cf0dee6c09db3d9001af0e2ad86ed2ba132fe3;hpb=aa18f05ce602d83298386a505ad3b0b3cba359e2;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/changes/EnhancedChangesList.php b/includes/changes/EnhancedChangesList.php
index 99cf0dee6c..df60f021b0 100644
--- a/includes/changes/EnhancedChangesList.php
+++ b/includes/changes/EnhancedChangesList.php
@@ -21,12 +21,12 @@
  */
 
 class EnhancedChangesList extends ChangesList {
-
+	/** @var array Array of array of RCCacheEntry */
 	protected $rc_cache;
 
 	/**
 	 * Add the JavaScript file for enhanced changeslist
-	 * @return String
+	 * @return string
 	 */
 	public function beginRecentChangesList() {
 		$this->rc_cache = array();
@@ -41,7 +41,6 @@ class EnhancedChangesList extends ChangesList {
 		$this->getOutput()->addModules( array(
 			'jquery.makeCollapsible',
 			'mediawiki.icon',
-			'mediawiki.special.changeslist.js',
 		) );
 
 		return '<div class="mw-changeslist">';
@@ -50,8 +49,8 @@ class EnhancedChangesList extends ChangesList {
 	/**
 	 * Format a line for enhanced recentchange (aka with javascript and block of lines).
 	 *
-	 * @param $baseRC RecentChange
-	 * @param $watched bool
+	 * @param RecentChange $baseRC
+	 * @param bool $watched
 	 *
 	 * @return string
 	 */
@@ -90,6 +89,7 @@ class EnhancedChangesList extends ChangesList {
 
 		// Page moves, very old style, not supported anymore
 		if ( $type == RC_MOVE || $type == RC_MOVE_OVER_REDIRECT ) {
+			$clink = '';
 		// New unpatrolled pages
 		} elseif ( $cacheEntry->unpatrolled && $type == RC_NEW ) {
 			$clink = Linker::linkKnown( $cacheEntry->getTitle() );
@@ -209,6 +209,7 @@ class EnhancedChangesList extends ChangesList {
 
 	/**
 	 * Enhanced RC group
+	 * @param RCCacheEntry[] $block
 	 * @return string
 	 */
 	protected function recentChangesBlockGroup( $block ) {
@@ -221,7 +222,7 @@ class EnhancedChangesList extends ChangesList {
 		if ( $block[0]->mAttribs['rc_log_type'] ) {
 			# Log entry
 			$classes[] = Sanitizer::escapeClass( 'mw-changeslist-log-'
-				. $block[0]->mAttribs['rc_log_type'] . '-' . $block[0]->mAttribs['rc_title'] );
+				. $block[0]->mAttribs['rc_log_type'] );
 		} else {
 			$classes[] = Sanitizer::escapeClass( 'mw-changeslist-ns'
 				. $block[0]->mAttribs['rc_namespace'] . '-' . $block[0]->mAttribs['rc_title'] );
@@ -242,6 +243,7 @@ class EnhancedChangesList extends ChangesList {
 		# Some catalyst variables...
 		$namehidden = true;
 		$allLogs = true;
+		$oldid = '';
 		foreach ( $block as $rcObj ) {
 			$oldid = $rcObj->mAttribs['rc_last_oldid'];
 			if ( $rcObj->mAttribs['rc_type'] == RC_NEW ) {
@@ -341,6 +343,7 @@ class EnhancedChangesList extends ChangesList {
 
 		$sinceLast = 0;
 		$unvisitedOldid = null;
+		/** @var $rcObj RCCacheEntry */
 		foreach ( $block as $rcObj ) {
 			// Same logic as below inside main foreach
 			if ( $rcObj->watched && $rcObj->mAttribs['rc_timestamp'] >= $rcObj->watched ) {
@@ -356,6 +359,8 @@ class EnhancedChangesList extends ChangesList {
 		# Total change link
 		$r .= ' ';
 		$logtext = '';
+		/** @var $block0 RecentChange */
+		$block0 = $block[0];
 		if ( !$allLogs ) {
 			if ( !ChangesList::userCan( $rcObj, Revision::DELETED_TEXT, $this->getUser() ) ) {
 				$logtext .= $nchanges[$n];
@@ -363,7 +368,7 @@ class EnhancedChangesList extends ChangesList {
 				$logtext .= $nchanges[$n];
 			} else {
 				$logtext .= Linker::link(
-					$block[0]->getTitle(),
+					$block0->getTitle(),
 					$nchanges[$n],
 					array(),
 					$queryParams + array(
@@ -374,7 +379,7 @@ class EnhancedChangesList extends ChangesList {
 				);
 				if ( $sinceLast > 0 && $sinceLast < $n ) {
 					$logtext .= $this->message['pipe-separator'] . Linker::link(
-						$block[0]->getTitle(),
+						$block0->getTitle(),
 						$sinceLastVisitMsg[$sinceLast],
 						array(),
 						$queryParams + array(
@@ -390,7 +395,7 @@ class EnhancedChangesList extends ChangesList {
 		# History
 		if ( $allLogs ) {
 			// don't show history link for logs
-		} elseif ( $namehidden || !$block[0]->getTitle()->exists() ) {
+		} elseif ( $namehidden || !$block0->getTitle()->exists() ) {
 			$logtext .= $this->message['pipe-separator'] . $this->message['enhancedrc-history'];
 		} else {
 			$params = $queryParams;
@@ -398,7 +403,7 @@ class EnhancedChangesList extends ChangesList {
 
 			$logtext .= $this->message['pipe-separator'] .
 				Linker::linkKnown(
-					$block[0]->getTitle(),
+					$block0->getTitle(),
 					$this->message['enhancedrc-history'],
 					array(),
 					$params
@@ -433,7 +438,7 @@ class EnhancedChangesList extends ChangesList {
 		}
 
 		$r .= $users;
-		$r .= $this->numberofWatchingusers( $block[0]->numberofWatchingusers );
+		$r .= $this->numberofWatchingusers( $block0->numberofWatchingusers );
 		$r .= '</td></tr>';
 
 		# Sub-entries
@@ -524,10 +529,10 @@ class EnhancedChangesList extends ChangesList {
 
 	/**
 	 * Generate HTML for an arrow or placeholder graphic
-	 * @param string $dir one of '', 'd', 'l', 'r'
-	 * @param string $alt text
-	 * @param string $title text
-	 * @return String: HTML "<img>" tag
+	 * @param string $dir One of '', 'd', 'l', 'r'
+	 * @param string $alt
+	 * @param string $title
+	 * @return string HTML "<img>" tag
 	 */
 	protected function arrow( $dir, $alt = '', $title = '' ) {
 		global $wgStylePath;
@@ -541,7 +546,7 @@ class EnhancedChangesList extends ChangesList {
 	/**
 	 * Generate HTML for a right- or left-facing arrow,
 	 * depending on language direction.
-	 * @return String: HTML "<img>" tag
+	 * @return string HTML "<img>" tag
 	 */
 	protected function sideArrow() {
 		$dir = $this->getLanguage()->isRTL() ? 'l' : 'r';
@@ -552,7 +557,7 @@ class EnhancedChangesList extends ChangesList {
 	/**
 	 * Generate HTML for a down-facing arrow
 	 * depending on language direction.
-	 * @return String: HTML "<img>" tag
+	 * @return string HTML "<img>" tag
 	 */
 	protected function downArrow() {
 		return $this->arrow( 'd', '-', $this->msg( 'rc-enhanced-hide' )->text() );
@@ -560,7 +565,7 @@ class EnhancedChangesList extends ChangesList {
 
 	/**
 	 * Generate HTML for a spacer image
-	 * @return String: HTML "<img>" tag
+	 * @return string HTML "<img>" tag
 	 */
 	protected function spacerArrow() {
 		return $this->arrow( '', codepointToUtf8( 0xa0 ) ); // non-breaking space
@@ -569,8 +574,8 @@ class EnhancedChangesList extends ChangesList {
 	/**
 	 * Enhanced RC ungrouped line.
 	 *
-	 * @param $rcObj RecentChange
-	 * @return String: a HTML formatted line (generated using $r)
+	 * @param RecentChange|RCCacheEntry $rcObj
+	 * @return string A HTML formatted line (generated using $r)
 	 */
 	protected function recentChangesBlockLine( $rcObj ) {
 		global $wgRCShowChangedSize;
@@ -583,8 +588,7 @@ class EnhancedChangesList extends ChangesList {
 		$classes = array( 'mw-enhanced-rc' );
 		if ( $logType ) {
 			# Log entry
-			$classes[] = Sanitizer::escapeClass( 'mw-changeslist-log-'
-				. $logType . '-' . $rcObj->mAttribs['rc_title'] );
+			$classes[] = Sanitizer::escapeClass( 'mw-changeslist-log-' . $logType );
 		} else {
 			$classes[] = Sanitizer::escapeClass( 'mw-changeslist-ns' .
 				$rcObj->mAttribs['rc_namespace'] . '-' . $rcObj->mAttribs['rc_title'] );