dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rdbms: update ILBFactory comments and simplify LoadBalancer "load" code a bit
[lhc/web/wiklou.git]
/
includes
/
GlobalFunctions.php
diff --git
a/includes/GlobalFunctions.php
b/includes/GlobalFunctions.php
index
c6c386c
..
1741958
100644
(file)
--- a/
includes/GlobalFunctions.php
+++ b/
includes/GlobalFunctions.php
@@
-2521,6
+2521,7
@@
function wfForeignMemcKey( $db, $prefix, ...$args ) {
* @return string
*/
function wfGlobalCacheKey( ...$args ) {
* @return string
*/
function wfGlobalCacheKey( ...$args ) {
+ wfDeprecated( __METHOD__, '1.30' );
return ObjectCache::getLocalClusterInstance()->makeGlobalKey( ...$args );
}
return ObjectCache::getLocalClusterInstance()->makeGlobalKey( ...$args );
}
@@
-2562,10
+2563,10
@@
function wfWikiID() {
* @todo Replace calls to wfGetDB with calls to LoadBalancer::getConnection()
* on an injected instance of LoadBalancer.
*
* @todo Replace calls to wfGetDB with calls to LoadBalancer::getConnection()
* on an injected instance of LoadBalancer.
*
- * @return \Wikimedia\Rdbms\D
atabase
+ * @return \Wikimedia\Rdbms\D
BConnRef
*/
function wfGetDB( $db, $groups = [], $wiki = false ) {
*/
function wfGetDB( $db, $groups = [], $wiki = false ) {
- return wfGetLB( $wiki )->get
Connection
( $db, $groups, $wiki );
+ return wfGetLB( $wiki )->get
MaintenanceConnectionRef
( $db, $groups, $wiki );
}
/**
}
/**