Merge branch 'bstable'

CHANGELOG.md

@@ -12,6 +12,9 @@ Sometimes the changelog has notes (not comprehensive) acknowledging people's wor
 
 ### v1.11.20
 
+**v1.11.20.4** *(2015-12-15)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.20.4/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.20.4/builds/4chan-X-noupdate.crx "Chromium version")]
+- Make Google search for full images work again.
+
 **v1.11.20.3** *(2015-12-11)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.20.3/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.20.3/builds/4chan-X-noupdate.crx "Chromium version")]
 - Turn `Pass Link` off and `Inline Cross-thread Quotes Only` on in new installs.
 

src/General/Config.coffee

@@ -703,7 +703,7 @@ Config =
     MD5: ''
 
   sauces: """
-    https://www.google.com/searchbyimage?image_url=%IMG
+    https://www.google.com/searchbyimage?image_url=%IMG%3Fs.jpg
     //iqdb.org/?url=%IMG
     http://eye.swfchan.com/search/?q=%name;types:swf;sandbox
     #//tineye.com/search?url=%IMG

src/General/Settings.coffee

@@ -336,6 +336,9 @@ Settings =
     if compareString < '00001.00011.00020.00003'
       for key, value of {'Inline Cross-thread Quotes Only': false, 'Pass Link': true}
         changes[key] = value unless data[key]?
+    if compareString < '00001.00011.00020.00004' or compareString is '00001.00011.00021.00000'
+      if data['sauces']?
+        changes['sauces'] = data['sauces'].replace /^#?\s*https:\/\/www\.google\.com\/searchbyimage\?image_url=%(?:IMG|URL)(?=$|;)/mg, '$&%3Fs.jpg'
     changes
 
   loadSettings: (data, cb) ->