Merge "Improved rate limit log to mention IP"

diff --git a/includes/User.php b/includes/User.php
index 8198282..6578341 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -1759,7 +1759,8 @@ class User {
                        // Already pinged?
                        if ( $count ) {
                                if ( $count >= $max ) {
-                                       wfDebugLog( 'ratelimit', $this->getName() . " tripped! $key at $count $summary" );
+                                       wfDebugLog( 'ratelimit', "User '{$this->getName()}' " .
+                                               "(IP {$this->getRequest()->getIP()}) tripped $key at $count $summary" );
                                        $triggered = true;
                                } else {
                                        wfDebug( __METHOD__ . ": ok. $key at $count $summary\n" );