* Add AOL IPs to whitelist by default

* Add period to "undo failed" message
* Use <p>, not <br />

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 860f1ab..38439fb 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -115,8 +115,8 @@ class EditPage {
                                                $text = $currev_text;
 
                                                #Give a warning
-                                               $this->editFormTextTop = "<h2>" . wfMsg('undofailed') . "</h2><br/>\n" .
-                                                                       wfMsg('explainundofailed');
+                                               $this->editFormTextTop = "<h2>" . wfMsg('undofailed') . "</h2>\n" .
+                                                                       '<p>'.wfMsg('explainundofailed').'</p>';
                                        }
                                }
                        }

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 1c89f74..4a1540b 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -998,7 +998,7 @@ the text into a text file and save it for later.</strong>',
 'nocreatetext' => 'This site has restricted the ability to create new pages.
 You can go back and edit an existing page, or [[Special:Userlogin|log in or create an account]].',
 'undofailed' => 'Undo Failed',
-'explainundofailed' => 'The edit could not be undone because of conflicting intermediate edits. Please manually undo the edits',
+'explainundofailed' => 'The edit could not be undone because of conflicting intermediate edits. Please manually undo the edits.',
 
 # Account creation failure
 'cantcreateaccounttitle' => 'Can\'t create account',
@@ -2622,7 +2622,28 @@ Please confirm that really want to recreate this page.',
 'autosumm-new' => 'New page: $1',
 
 # Autoblock whitelist
-'autoblock_whitelist' => '',
+'autoblock_whitelist' => 'AOL http://webmaster.info.aol.com/proxyinfo.html
+*64.12.96.0/19
+*149.174.160.0/20
+*152.163.240.0/21
+*152.163.248.0/22
+*152.163.252.0/23
+*152.163.96.0/22
+*152.163.100.0/23
+*195.93.32.0/22
+*195.93.48.0/22
+*195.93.64.0/19
+*195.93.96.0/19
+*195.93.16.0/20
+*198.81.0.0/22
+*198.81.16.0/20
+*198.81.8.0/23
+*202.67.64.128/25
+*205.188.192.0/20
+*205.188.208.0/23
+*205.188.112.0/20
+*205.188.146.144/30
+*207.200.112.0/21',
 
 );