X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fchanges%2FChangesList.php;h=9567700914b62065debeda07f61ab9b986111faf;hb=de8f8c8248341c007ab6a9365a3c40614bcf04dc;hp=2494ef1098e572def16ce6ada0ac5eb97f15c320;hpb=230e94533a03ef7b9980a85709419ca2bf52f5f7;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/changes/ChangesList.php b/includes/changes/ChangesList.php
index 2494ef1098..9567700914 100644
--- a/includes/changes/ChangesList.php
+++ b/includes/changes/ChangesList.php
@@ -364,12 +364,24 @@ class ChangesList extends ContextSource {
 	}
 
 	/**
-	 * @param string $s HTML to update
+	 * @param string $s Article link will be appended to this string, in place.
 	 * @param RecentChange $rc
 	 * @param bool $unpatrolled
 	 * @param bool $watched
+	 * @deprecated since 1.27, use getArticleLink instead.
 	 */
-	public function insertArticleLink( &$s, &$rc, $unpatrolled, $watched ) {
+	public function insertArticleLink( &$s, RecentChange $rc, $unpatrolled, $watched ) {
+		$s .= $this->getArticleLink( $rc, $unpatrolled, $watched );
+	}
+
+	/**
+	 * @param RecentChange $rc
+	 * @param bool $unpatrolled
+	 * @param bool $watched
+	 * @return string HTML
+	 * @since 1.26
+	 */
+	public function getArticleLink( &$rc, $unpatrolled, $watched ) {
 		$params = array();
 		if ( $rc->getTitle()->isRedirect() ) {
 			$params = array( 'redirect' => 'no' );
@@ -389,23 +401,12 @@ class ChangesList extends ContextSource {
 		# RTL/LTR marker
 		$articlelink .= $this->getLanguage()->getDirMark();
 
+		# TODO: Deprecate the $s argument, it seems happily unused.
+		$s = '';
 		Hooks::run( 'ChangesListInsertArticleLink',
 			array( &$this, &$articlelink, &$s, &$rc, $unpatrolled, $watched ) );
 
-		$s .= " $articlelink";
-	}
-
-	/**
-	 * @param RecentChange $rc
-	 * @param bool $unpatrolled
-	 * @param bool $watched
-	 * @return string
-	 * @since 1.26
-	 */
-	public function getArticleLink( RecentChange $rc, $unpatrolled, $watched ) {
-		$s = '';
-		$this->insertArticleLink( $s, $rc, $unpatrolled, $watched );
-		return $s;
+		return "{$s} {$articlelink}";
 	}
 
 	/**