# HG changeset patch # User Paul Boddie # Date 1368824829 -7200 # Node ID d3c11f5d39523abcc644a04106009082603c5b88 # Parent 145f3765afdc8e6a9c890c48caac2fce38e65bdc Removed the feed-specific "show" attribute since the amount of information shown is more conveniently defined by the macro and probably rarely needs to be controlled for each feed. diff -r 145f3765afdc -r d3c11f5d3952 macros/SharedContent.py --- a/macros/SharedContent.py Fri May 17 20:05:04 2013 +0200 +++ b/macros/SharedContent.py Fri May 17 23:07:09 2013 +0200 @@ -257,7 +257,6 @@ unspecified.append(source_name) continue - show_feed_content = source_parameters.get("show", show_content) try: max_entries_for_feed = int(source_parameters["limit"]) except (KeyError, ValueError): @@ -267,7 +266,7 @@ if source_parameters.get("type") == "url": try: - feed_info, feed_updates = getUpdates(request, location, max_entries_for_feed, show_feed_content) + feed_info, feed_updates = getUpdates(request, location, max_entries_for_feed, show_content) updates += feed_updates feeds.append((location, feed_info)) except FeedMissingError: