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
Merge "ApiOptions: set form field parent earlier"
[lhc/web/wiklou.git]
/
includes
/
GlobalFunctions.php
diff --git
a/includes/GlobalFunctions.php
b/includes/GlobalFunctions.php
index
8c55d9a
..
b5de66f
100644
(file)
--- a/
includes/GlobalFunctions.php
+++ b/
includes/GlobalFunctions.php
@@
-501,12
+501,26
@@
function wfAppendQuery( $url, $query ) {
$query = wfArrayToCgi( $query );
}
if ( $query != '' ) {
$query = wfArrayToCgi( $query );
}
if ( $query != '' ) {
+ // Remove the fragment, if there is one
+ $fragment = false;
+ $hashPos = strpos( $url, '#' );
+ if ( $hashPos !== false ) {
+ $fragment = substr( $url, $hashPos );
+ $url = substr( $url, 0, $hashPos );
+ }
+
+ // Add parameter
if ( false === strpos( $url, '?' ) ) {
$url .= '?';
} else {
$url .= '&';
}
$url .= $query;
if ( false === strpos( $url, '?' ) ) {
$url .= '?';
} else {
$url .= '&';
}
$url .= $query;
+
+ // Put the fragment back
+ if ( $fragment !== false ) {
+ $url .= $fragment;
+ }
}
return $url;
}
}
return $url;
}
@@
-3109,9
+3123,6
@@
function wfSplitWikiID( $wiki ) {
* Note 2: use $this->getDB() in maintenance scripts that may be invoked by
* updater to ensure that a proper database is being updated.
*
* Note 2: use $this->getDB() in maintenance scripts that may be invoked by
* updater to ensure that a proper database is being updated.
*
- * @todo Replace calls to wfGetDB with calls to LoadBalancer::getConnection()
- * on an injected instance of LoadBalancer.
- *
* @return DatabaseBase
*/
function wfGetDB( $db, $groups = [], $wiki = false ) {
* @return DatabaseBase
*/
function wfGetDB( $db, $groups = [], $wiki = false ) {
@@
-3121,30
+3132,20
@@
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.
- *
* @param string|bool $wiki Wiki ID, or false for the current wiki
* @return LoadBalancer
*/
function wfGetLB( $wiki = false ) {
* @param string|bool $wiki Wiki ID, or false for the current wiki
* @return LoadBalancer
*/
function wfGetLB( $wiki = false ) {
- if ( $wiki === false ) {
- return \MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancer();
- } else {
- $factory = \MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
- return $factory->getMainLB( $wiki );
- }
+ return wfGetLBFactory()->getMainLB( $wiki );
}
/**
* Get the load balancer factory object
*
}
/**
* Get the load balancer factory object
*
- * @deprecated since 1.27, use MediaWikiServices::getDBLoadBalancerFactory() instead.
- *
* @return LBFactory
*/
function wfGetLBFactory() {
* @return LBFactory
*/
function wfGetLBFactory() {
- return
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory
();
+ return
LBFactory::singleton
();
}
/**
}
/**