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
session: Fix missing return in SessionBackend::resetId()
[lhc/web/wiklou.git]
/
includes
/
GlobalFunctions.php
diff --git
a/includes/GlobalFunctions.php
b/includes/GlobalFunctions.php
index
a74060c
..
319bf63
100644
(file)
--- a/
includes/GlobalFunctions.php
+++ b/
includes/GlobalFunctions.php
@@
-225,7
+225,7
@@
function wfMergeErrorArrays( ...$args ) {
*
* @param array $array The array.
* @param array $insert The array to insert.
*
* @param array $array The array.
* @param array $insert The array to insert.
- * @param mixed $after The key to insert after
+ * @param mixed $after The key to insert after
. Callers need to make sure the key is set.
* @return array
*/
function wfArrayInsertAfter( array $array, array $insert, $after ) {
* @return array
*/
function wfArrayInsertAfter( array $array, array $insert, $after ) {
@@
-2657,8
+2657,8
@@
function wfGetDB( $db, $groups = [], $wiki = false ) {
/**
* Get a load balancer object.
*
/**
* Get a load balancer object.
*
- * @deprecated since 1.27, use MediaWikiServices::getDBLoadBalancer()
- * or MediaWikiServices::getDBLoadBalancerFactory() instead.
+ * @deprecated since 1.27, use MediaWikiServices::get
Instance()->get
DBLoadBalancer()
+ * or MediaWikiServices::get
Instance()->get
DBLoadBalancerFactory() instead.
*
* @param string|bool $wiki Wiki ID, or false for the current wiki
* @return \Wikimedia\Rdbms\LoadBalancer
*
* @param string|bool $wiki Wiki ID, or false for the current wiki
* @return \Wikimedia\Rdbms\LoadBalancer
@@
-2675,7
+2675,7
@@
function wfGetLB( $wiki = false ) {
/**
* Get the load balancer factory object
*
/**
* Get the load balancer factory object
*
- * @deprecated since 1.27, use MediaWikiServices::getDBLoadBalancerFactory() instead.
+ * @deprecated since 1.27, use MediaWikiServices::get
Instance()->get
DBLoadBalancerFactory() instead.
*
* @return \Wikimedia\Rdbms\LBFactory
*/
*
* @return \Wikimedia\Rdbms\LBFactory
*/
@@
-3123,7
+3123,7
@@
function wfIsBadImage( $name, $contextTitle = false, $blacklist = null ) {
function wfCanIPUseHTTPS( $ip ) {
$canDo = true;
Hooks::run( 'CanIPUseHTTPS', [ $ip, &$canDo ] );
function wfCanIPUseHTTPS( $ip ) {
$canDo = true;
Hooks::run( 'CanIPUseHTTPS', [ $ip, &$canDo ] );
- return
!!
$canDo;
+ return
(bool)
$canDo;
}
/**
}
/**