Merge "RCFilters: Style the Saved Links placeholder and add a title"

[lhc/web/wiklou.git] / includes / GlobalFunctions.php

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 9c70639..1859c02 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2960,10 +2960,9 @@ function wfGetPrecompiledData( $name ) {
 }
 
 /**
- * @deprecated since 1.30 Call makeKey on a ObjectCache instance
- *
  * Make a cache key for the local wiki.
  *
+ * @deprecated since 1.30 Call makeKey on a BagOStuff instance
  * @param string $args,...
  * @return string
  */
@@ -2994,14 +2993,13 @@ function wfForeignMemcKey( $db, $prefix /*...*/ ) {
 }
 
 /**
- * @deprecated since 1.30 Call makeGlobalKey on a ObjectCache instance
- *
  * Make a cache key with database-agnostic prefix.
  *
  * Doesn't have a wiki-specific namespace. Uses a generic 'global' prefix
  * instead. Must have a prefix as otherwise keys that use a database name
  * in the first segment will clash with wfMemcKey/wfForeignMemcKey.
  *
+ * @deprecated since 1.30 Call makeGlobalKey on a BagOStuff instance
  * @since 1.26
  * @param string $args,...
  * @return string