Index: trunk/phase3/includes/SpecialRecentchanges.php |
— | — | @@ -56,10 +56,7 @@ |
57 | 57 | # As a feed, use limited settings only |
58 | 58 | if( $feedFormat ) { |
59 | 59 | global $wgFeedLimit; |
60 | | - if( $limit > $wgFeedLimit ) { |
61 | | - $limit = $wgFeedLimit; |
62 | | - } |
63 | | - |
| 60 | + $limit = min( $wgFeedLimit, $limit ); |
64 | 61 | } else { |
65 | 62 | |
66 | 63 | $namespace = $wgRequest->getIntOrNull( 'namespace' ); |
— | — | @@ -509,6 +506,7 @@ |
510 | 507 | if ($more != '') $more .= '&'; |
511 | 508 | |
512 | 509 | # Sort data for display and make sure it's unique after we've added user data. |
| 510 | + # FIXME: why does this piss around with globals like this? Why is $limit added on globally? |
513 | 511 | $wgRCLinkLimits[] = $limit; |
514 | 512 | $wgRCLinkDays[] = $days; |
515 | 513 | sort($wgRCLinkLimits); |