From: Tim Starling <tstarling@users.mediawiki.org>
Date: Wed, 9 Apr 2008 15:22:27 +0000 (+0000)
Subject: Fixed a couple of potential catchable fatal errors when memcached debugging is enabled
X-Git-Tag: 1.31.0-rc.0~48487
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=be48d07435bcc24026c15211a3d0229d6a67f143;p=lhc%2Fweb%2Fwiklou.git

Fixed a couple of potential catchable fatal errors when memcached debugging is enabled
---

diff --git a/includes/memcached-client.php b/includes/memcached-client.php
index 21f0c83e9b..8adb5233a0 100644
--- a/includes/memcached-client.php
+++ b/includes/memcached-client.php
@@ -402,6 +402,10 @@ class memcached
       $fname = 'memcached::get';
       wfProfileIn( $fname );
 
+      if ( $this->_debug ) {
+         $this->_debugprint( "get($key)\n" );
+      }
+
       if (!$this->_active) {
 	 wfProfileOut( $fname );
          return false;
@@ -429,7 +433,7 @@ class memcached
 
       if ($this->_debug)
          foreach ($val as $k => $v)
-            $this->_debugprint(@sprintf("MemCache: sock %s got %s => %s\r\n", serialize($sock), $k, $v));
+            $this->_debugprint(sprintf("MemCache: sock %s got %s\n", serialize($sock), $k));
 
       wfProfileOut( $fname );
       return @$val[$key];
@@ -495,7 +499,7 @@ class memcached
 
       if ($this->_debug)
          foreach ($val as $k => $v)
-            $this->_debugprint(sprintf("MemCache: got %s => %s\r\n", $k, $v));
+            $this->_debugprint(sprintf("MemCache: got %s\n", $k));
 
       return $val;
    }