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
Mark wfBaseConvert() as deprecated.
[lhc/web/wiklou.git]
/
includes
/
GlobalFunctions.php
diff --git
a/includes/GlobalFunctions.php
b/includes/GlobalFunctions.php
index
3bc3a90
..
43b936b
100644
(file)
--- a/
includes/GlobalFunctions.php
+++ b/
includes/GlobalFunctions.php
@@
-308,10
+308,15
@@
function wfMergeErrorArrays( /*...*/ ) {
$out = array();
foreach ( $args as $errors ) {
foreach ( $errors as $params ) {
$out = array();
foreach ( $args as $errors ) {
foreach ( $errors as $params ) {
+ $originalParams = $params;
+ if ( $params[0] instanceof MessageSpecifier ) {
+ $msg = $params[0];
+ $params = array_merge( array( $msg->getKey() ), $msg->getParams() );
+ }
# @todo FIXME: Sometimes get nested arrays for $params,
# which leads to E_NOTICEs
$spec = implode( "\t", $params );
# @todo FIXME: Sometimes get nested arrays for $params,
# which leads to E_NOTICEs
$spec = implode( "\t", $params );
- $out[$spec] = $
p
arams;
+ $out[$spec] = $
originalP
arams;
}
}
return array_values( $out );
}
}
return array_values( $out );
@@
-1233,7
+1238,7
@@
function wfLogWarning( $msg, $callerOffset = 1, $level = E_USER_WARNING ) {
* @param string $file Filename
* @param array $context Additional logging context data
* @throws MWException
* @param string $file Filename
* @param array $context Additional logging context data
* @throws MWException
- * @deprecated since 1.25 Use \
\MediaWiki\\Logger\
\LegacyLogger::emit or UDPTransport
+ * @deprecated since 1.25 Use \
MediaWiki\Logger
\LegacyLogger::emit or UDPTransport
*/
function wfErrorLog( $text, $file, array $context = array() ) {
wfDeprecated( __METHOD__, '1.25' );
*/
function wfErrorLog( $text, $file, array $context = array() ) {
wfDeprecated( __METHOD__, '1.25' );
@@
-3325,6
+3330,8
@@
function wfRelativePath( $path, $from ) {
* Supports base 2 through 36; digit values 10-36 are represented
* as lowercase letters a-z. Input is case-insensitive.
*
* Supports base 2 through 36; digit values 10-36 are represented
* as lowercase letters a-z. Input is case-insensitive.
*
+ * @deprecated 1.27 Use Wikimedia\base_convert() directly
+ *
* @param string $input Input number
* @param int $sourceBase Base of the input number
* @param int $destBase Desired base of the output
* @param string $input Input number
* @param int $sourceBase Base of the input number
* @param int $destBase Desired base of the output