Make sure to use table prefixes correctly. Thanks to siebrand for reporting the...

diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index 546f0c7..cee1cc8 100644 (file)
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -362,7 +362,10 @@ class EmailNotification {
                                }
                                $dbr = wfGetDB( DB_SLAVE );
 
-                               $res = $dbr->select( array( 'watchlist', 'user' ), array( 'user.*' ),
+                               list( $user ) = $dbr->tableNamesN( 'user' );
+
+                               $res = $dbr->select( array( 'watchlist', 'user' ),
+                                       array( "$user.*" ),
                                        array(
                                                'wl_user=user_id',
                                                'wl_title' => $title->getDBkey(),