http://www.mediawiki.org/wiki/Special:Code/MediaWiki/95040
Revision: 95040
Author: khorn
Date: 2011-08-19 20:55:55 +0000 (Fri, 19 Aug 2011)
Log Message:
-----------
Stylistic change to the mergeArrayDeafults function in ContributionTracking.
r94720
Modified Paths:
--------------
trunk/extensions/ContributionTracking/ContributionTracking.processor.php
Modified:
trunk/extensions/ContributionTracking/ContributionTracking.processor.php
===================================================================
--- trunk/extensions/ContributionTracking/ContributionTracking.processor.php
2011-08-19 20:17:38 UTC (rev 95039)
+++ trunk/extensions/ContributionTracking/ContributionTracking.processor.php
2011-08-19 20:55:55 UTC (rev 95040)
@@ -269,15 +269,16 @@
* @return array
*/
static function mergeArrayDefaults( $params, $defaults, $nullify=false
) {
- foreach ( $defaults as $key => $value ) {
+ $ret = $defaults;
+ foreach ( $ret as $key => $value ) {
if ( array_key_exists( $key, $params ) ) {
- $defaults[$key] = $params[$key];
+ $ret[$key] = $params[$key];
}
- if ( $nullify && $defaults[$key] === '' ) {
- $defaults[$key] = null;
+ if ( $nullify && $ret[$key] === '' ) {
+ $ret[$key] = null;
}
}
- return $defaults;
+ return $ret;
}
/**
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
