Move WikiMap class from CentralAuth to core, since it's used in 2 extensions at least...

[lhc/web/wiklou.git] / includes / memcached-client.php

diff --git a/includes/memcached-client.php b/includes/memcached-client.php
index 1a3d39c..7974530 100644 (file)
--- 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;
 
                // }}}
 
@@ -454,7 +454,7 @@ class memcached
       if (!$this->_active)
          return false;
 
-      $this->stats['get_multi']++;
+      @$this->stats['get_multi']++;
       $sock_keys = array();
 
       foreach ($keys as $key)
@@ -800,8 +800,8 @@ class memcached
          if (is_resource($sock)) {
             $this->_flush_read_buffer($sock);
             return $sock;
-         }
-         $hv += $this->_hashfunc($tries . $realkey);
+                }
+         $hv = $this->_hashfunc( $hv . $realkey );
       }
 
       return false;
@@ -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"))