From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 9 Jul 2008 01:07:49 +0000 (+0000)
Subject: Revert r37295 "(bug 14159) Use of MEMCACHE_COMPRESSED constant causes an E_NOTICE... 
X-Git-Tag: 1.31.0-rc.0~46622
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=bdbe18e08ea873a656d6209b21e2d214dcc3be0e;p=lhc%2Fweb%2Fwiklou.git

Revert r37295 "(bug 14159) Use of MEMCACHE_COMPRESSED constant causes an E_NOTICE on PHP installs with the Memcache module installed. Renamed to MEMCACHE_MCOMPRESSED."
No such constant is modified here... there's a class constant instead which is being renamed, apparently for no reason.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index ef9cce3447..d8f9b386cf 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -425,8 +425,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 14709) Fix login success message formatting when using cookie check
 * (bug 14710) Remove "donate" link from default sidebar
 * (bug 14745) Image moving works on sites that transform thumbnails via 404
-* (bug 14159) Use of MEMCACHE_COMPRESSED constant no longer causes E_NOTICE 
-  on PHP installs with the Memcache module installed.
 * (bug 2186) Document.write() in wikibits caused failures when using
   application/xhtml+xml. The calls to this have been removed.
 
diff --git a/includes/memcached-client.php b/includes/memcached-client.php
index 1a3d39ce62..6bd1838739 100644
--- a/includes/memcached-client.php
+++ b/includes/memcached-client.php
@@ -86,7 +86,7 @@ class memcached
 		/**
 		 * Flag: indicates data is compressed
 		 */
-		const MCOMPRESSED = 2;
+		const COMPRESSED = 2;
 
 		// }}}
 
@@ -908,7 +908,7 @@ class memcached
                return false;
             }
 
-            if ($this->_have_zlib && $flags & memcached::MCOMPRESSED)
+            if ($this->_have_zlib && $flags & memcached::COMPRESSED)
                $ret[$rkey] = gzuncompress($ret[$rkey]);
 
             $ret[$rkey] = rtrim($ret[$rkey]);
@@ -973,7 +973,7 @@ class memcached
                $this->_debugprint(sprintf("client: compressing data; was %d bytes is now %d bytes\n", $len, $c_len));
             $val = $c_val;
             $len = $c_len;
-            $flags |= memcached::MCOMPRESSED;
+            $flags |= memcached::COMPRESSED;
          }
       }
       if (!$this->_safe_fwrite($sock, "$cmd $key $flags $exp $len\r\n$val\r\n"))