From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 9 Jan 2013 08:24:16 +0000 (+0000)
Subject: Merge "Miscellaneous profiling fixes"
X-Git-Tag: 1.31.0-rc.0~21098
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/cotisations/rappels.php?a=commitdiff_plain;h=5e2eb7f385e22fe3e2a482b77960369d4fc24f96;p=lhc%2Fweb%2Fwiklou.git

Merge "Miscellaneous profiling fixes"
---

5e2eb7f385e22fe3e2a482b77960369d4fc24f96
diff --cc includes/Linker.php
index 7d84a6a001,d1a1ac0fa5..6b0d4442ef
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@@ -1927,16 -1921,9 +1927,16 @@@ class Linker 
  					. wfMessage( 'word-separator' )->escaped()
  					. $protected . '</li>';
  			}
 +
 +			if ( $more instanceof Title ) {
 +				$outText .= '<li>' . self::link( $more, wfMessage( 'moredotdotdot' ) ) . '</li>';
 +			} elseif ( $more ) {
 +				$outText .= "<li>$more</li>";
 +			}
 +
  			$outText .= '</ul>';
  		}
- 		wfProfileOut( __METHOD__  );
+ 		wfProfileOut( __METHOD__ );
  		return $outText;
  	}