[or-cvs] [https-everywhere/master 3/3] Support an alternative wikipedia URL form

[pde at torproject.org]

Author: Peter Eckersley <pde at eff.org>
Date: Sun, 17 Oct 2010 19:10:27 -0400
Subject: Support an alternative wikipedia URL form
Commit: 8cf8b4e76893d72ee6ead604e50cdc29a6003533

---
 src/chrome/content/rules/Wikipedia.xml |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/chrome/content/rules/Wikipedia.xml b/src/chrome/content/rules/Wikipedia.xml
index 87930b3..24c3778 100644
--- a/src/chrome/content/rules/Wikipedia.xml
+++ b/src/chrome/content/rules/Wikipedia.xml
@@ -10,11 +10,19 @@
      be protected.  -->
 
 <ruleset name="Wikipedia">
+
   <exclusion pattern="^http://www\.wik(ipedia|inews|isource|ibooks|iquote|iversity)\.org/"/>
+
   <rule from="^http://([^@:/]+)\.wik(ipedia|inews|isource|ibooks|iquote|iversity|tionary)\.org/wiki/"
           to="https://secure.wikimedia.org/wik$2/$1/wiki/"/>
+
   <rule from="^http://([^@:/]+)\.wik(ipedia|inews|isource|ibooks|iquote|iversity|tionary)\.org/?$"
           to="https://secure.wikimedia.org/wik$2/$1/wiki/"/>
+
   <rule from="^http://(meta|commons|incubator|species|outreach|strategy|usability|wikimania|test|survey)\.wikimedia\.org/wiki/"
           to="https://secure.wikimedia.org/wikipedia/$1/wiki/"/>
+
+  <rule from="^http://([^@:/]+)\.wik(ipedia|inews|isource|ibooks|iquote|iversity|tionary)\.org/w/index.php\?title="
+          to="https://secure.wikimedia.org/wik$2/$1/wiki/"/>
+
 </ruleset>
-- 
1.7.1