From: Timo Tijhof <krinklemail@gmail.com>
Date: Thu, 22 Oct 2015 01:35:35 +0000 (+0100)
Subject: objectcache: Fix grammar error in BagOStuff::getWithToken doc
X-Git-Tag: 1.31.0-rc.0~9301^2
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/%7B%7B%20url_for%28%27admin_users%27%29%20%7D%7D?a=commitdiff_plain;h=92b197dc595c69a7bca068bdb9eb681f8406be50;p=lhc%2Fweb%2Fwiklou.git

objectcache: Fix grammar error in BagOStuff::getWithToken doc

Follows-up 1fa1235d32.

Change-Id: I19a4430609423f5ff32a1014ed21131175469adf
---

diff --git a/includes/libs/objectcache/BagOStuff.php b/includes/libs/objectcache/BagOStuff.php
index 95c1bc76c7..fc75f56dfb 100644
--- a/includes/libs/objectcache/BagOStuff.php
+++ b/includes/libs/objectcache/BagOStuff.php
@@ -152,7 +152,7 @@ abstract class BagOStuff implements LoggerAwareInterface {
 	abstract protected function doGet( $key, $flags = 0 );
 
 	/**
-	 * @note: This method is only needed if cas() is not is used for merge()
+	 * @note: This method is only needed if merge() uses mergeViaCas()
 	 *
 	 * @param string $key
 	 * @param mixed $casToken