X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FTitle.php;h=0cac64ab17058127eceb9a71704109d6ba123228;hb=a7f7f8cbcb14a2ca597b5510d2549e74b3617667;hp=d0c8b3b86983185f5a94f4879f2422ec80528c25;hpb=7fd9739c9ca67a9bc7dfac87d93f78602f7d726b;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Title.php b/includes/Title.php
index d0c8b3b869..0cac64ab17 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1782,7 +1782,6 @@ class Title {
 	 * @return string The URL
 	 */
 	public function getLinkURL( $query = '', $query2 = false, $proto = PROTO_RELATIVE ) {
-		wfProfileIn( __METHOD__ );
 		if ( $this->isExternal() || $proto !== PROTO_RELATIVE ) {
 			$ret = $this->getFullURL( $query, $query2, $proto );
 		} elseif ( $this->getPrefixedText() === '' && $this->hasFragment() ) {
@@ -1790,7 +1789,6 @@ class Title {
 		} else {
 			$ret = $this->getLocalURL( $query, $query2 ) . $this->getFragmentForURL();
 		}
-		wfProfileOut( __METHOD__ );
 		return $ret;
 	}
 
@@ -2444,7 +2442,6 @@ class Title {
 	protected function getUserPermissionsErrorsInternal( $action, $user,
 		$doExpensiveQueries = true, $short = false
 	) {
-		wfProfileIn( __METHOD__ );
 
 		# Read has special handling
 		if ( $action == 'read' ) {
@@ -2485,7 +2482,6 @@ class Title {
 			$errors = $this->$method( $action, $user, $errors, $doExpensiveQueries, $short );
 		}
 
-		wfProfileOut( __METHOD__ );
 		return $errors;
 	}
 
@@ -2721,8 +2717,6 @@ class Title {
 			return array( $this->mHasCascadingRestrictions, $pagerestrictions );
 		}
 
-		wfProfileIn( __METHOD__ );
-
 		$dbr = wfGetDB( DB_SLAVE );
 
 		if ( $this->getNamespace() == NS_FILE ) {
@@ -2797,7 +2791,6 @@ class Title {
 			$this->mHasCascadingRestrictions = $sources;
 		}
 
-		wfProfileOut( __METHOD__ );
 		return array( $sources, $pagerestrictions );
 	}
 
@@ -4046,7 +4039,7 @@ class Title {
 		if ( $this->mIsBigDeletion === null ) {
 			$dbr = wfGetDB( DB_SLAVE );
 
-			$innerQuery = $dbr->selectSQLText(
+			$revCount = $dbr->selectRowCount(
 				'revision',
 				'1',
 				array( 'rev_page' => $this->getArticleID() ),
@@ -4054,13 +4047,6 @@ class Title {
 				array( 'LIMIT' => $wgDeleteRevisionsLimit + 1 )
 			);
 
-			$revCount = $dbr->query(
-				'SELECT COUNT(*) FROM (' . $innerQuery . ') AS innerQuery',
-				__METHOD__
-			);
-			$revCount = $revCount->fetchRow();
-			$revCount = $revCount['COUNT(*)'];
-
 			$this->mIsBigDeletion = $revCount > $wgDeleteRevisionsLimit;
 		}
 
@@ -4630,16 +4616,13 @@ class Title {
 	 */
 	public function getPageLanguage() {
 		global $wgLang, $wgLanguageCode;
-		wfProfileIn( __METHOD__ );
 		if ( $this->isSpecialPage() ) {
 			// special pages are in the user language
-			wfProfileOut( __METHOD__ );
 			return $wgLang;
 		}
 
 		// Checking if DB language is set
 		if ( $this->mDbPageLanguage ) {
-			wfProfileOut( __METHOD__ );
 			return wfGetLangObj( $this->mDbPageLanguage );
 		}
 
@@ -4657,7 +4640,6 @@ class Title {
 			$langObj = wfGetLangObj( $this->mPageLanguage[0] );
 		}
 
-		wfProfileOut( __METHOD__ );
 		return $langObj;
 	}