From 92b197dc595c69a7bca068bdb9eb681f8406be50 Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Thu, 22 Oct 2015 02:35:35 +0100 Subject: [PATCH] objectcache: Fix grammar error in BagOStuff::getWithToken doc Follows-up 1fa1235d32. Change-Id: I19a4430609423f5ff32a1014ed21131175469adf --- includes/libs/objectcache/BagOStuff.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.20.1