Merge remote-tracking branch 'upstream/master'

2013-03-19 19:20:14 +00:00
parent 05809dfdf7 451ff72289
commit 598a8f37a2
38 changed files with 3693 additions and 3266 deletions
@@ -722,6 +722,13 @@ function editSelectedFeeds() {
 								}
 							} catch (e) { }

+							try {
+								if (!query.match("&hide_images=") &&
+										this.getChildByName('hide_images').attr('disabled') == false) {
+									query = query + "&hide_images=false";
+								}
+							} catch (e) { }
+
 							if (!query.match("&include_in_digest=") &&
 									this.getChildByName('include_in_digest').attr('disabled') == false) {
 								query = query + "&include_in_digest=false";