From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 1 Feb 2013 18:16:09 +0000 (+0000)
Subject: Merge "Fixed use of long memcached keys in AllPages."
X-Git-Tag: 1.31.0-rc.0~20830
X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_add%27%29%20%7D%7D?a=commitdiff_plain;h=ef0e671fed5936b1a85e6a6d400a5c6ba7d1399c;p=lhc%2Fweb%2Fwiklou.git

Merge "Fixed use of long memcached keys in AllPages."
---

ef0e671fed5936b1a85e6a6d400a5c6ba7d1399c
diff --cc includes/specials/SpecialAllpages.php
index df65e4a9b1,84a3fe7e90..401e65db41
--- a/includes/specials/SpecialAllpages.php
+++ b/includes/specials/SpecialAllpages.php
@@@ -188,13 -188,13 +188,13 @@@ class SpecialAllpages extends Includabl
  		$from = ( $from && $from->isLocal() ) ? $from->getDBkey() : null;
  		$to = ( $to && $to->isLocal() ) ? $to->getDBkey() : null;
  
 -		if( isset($from) )
 -			$where[] = 'page_title >= '.$dbr->addQuotes( $from );
 -		if( isset($to) )
 -			$where[] = 'page_title <= '.$dbr->addQuotes( $to );
 +		if( isset( $from ) )
 +			$where[] = 'page_title >= ' . $dbr->addQuotes( $from );
 +		if( isset( $to ) )
 +			$where[] = 'page_title <= ' . $dbr->addQuotes( $to );
  
  		global $wgMemc;
- 		$key = wfMemcKey( 'allpages', 'ns', $namespace, $from, $to );
+ 		$key = wfMemcKey( 'allpages', 'ns', $namespace, sha1( $from ), sha1( $to ) );
  		$lines = $wgMemc->get( $key );
  
  		$count = $dbr->estimateRowCount( 'page', '*', $where, __METHOD__ );