| Index: branches/wmf/1.17wmf1/includes/User.php |
| — | — | @@ -3635,8 +3635,8 @@ |
| 3636 | 3636 | * Used by things like CentralAuth and perhaps other authplugins. |
| 3637 | 3637 | */ |
| 3638 | 3638 | public function addNewUserLogEntryAutoCreate() { |
| 3639 | | - global $wgNewUserLog, $wgLogAutocreatedAccounts; |
| 3640 | | - if( !$wgNewUserLog || !$wgLogAutocreatedAccounts ) { |
| | 3639 | + global $wgNewUserLog; |
| | 3640 | + if( !$wgNewUserLog ) { |
| 3641 | 3641 | return true; // disabled |
| 3642 | 3642 | } |
| 3643 | 3643 | $log = new LogPage( 'newusers', false ); |
| Property changes on: branches/wmf/1.17wmf1/includes/User.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 3644 | 3644 | Merged /trunk/phase3/includes/User.php:r85128 |
| Index: branches/wmf/1.17wmf1/includes/DefaultSettings.php |
| — | — | @@ -4815,11 +4815,6 @@ |
| 4816 | 4816 | */ |
| 4817 | 4817 | $wgNewUserLog = true; |
| 4818 | 4818 | |
| 4819 | | -/** |
| 4820 | | - * Log the automatic creations of new users accounts? |
| 4821 | | - */ |
| 4822 | | -$wgLogAutocreatedAccounts = false; |
| 4823 | | - |
| 4824 | 4819 | /** @} */ # end logging } |
| 4825 | 4820 | |
| 4826 | 4821 | /*************************************************************************//** |
| Property changes on: branches/wmf/1.17wmf1/includes/DefaultSettings.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 4827 | 4822 | Merged /trunk/phase3/includes/DefaultSettings.php:r85128 |