# HG changeset patch
# User Daniel Poelzleithner <poelzi@poelzi.org>
# Date 1286651610 -7200
# Node ID ab0149f40b750c51823002711d7cdef9648d18e0
# Parent  6d30e49ad609422de01bd9e2d5d53c0e08ab44f9# Parent  3d0b6f87d8e59009e13aa9b053e5eeb89e76f7c8
merge

diff -r 6d30e49ad609 -r ab0149f40b75 app/main/timeline/_action/update.lua
--- a/app/main/timeline/_action/update.lua	Sat Oct 09 21:11:59 2010 +0200
+++ b/app/main/timeline/_action/update.lua	Sat Oct 09 21:13:30 2010 +0200
@@ -28,14 +28,14 @@
   end
 end
 
+if not options_string then
+  options_string = "issue_created:* issue_finished_after_voting:* issue_accepted:* issue_voting_started:* suggestion_created:* issue_canceled:* initiative_created:* issue_finished_without_voting:* draft_created:* initiative_revoked:* issue_half_frozen:* "
+end
+
 if param.get_list("option_ignore_area", atom.string) then
   options_string = options_string.." ignore_area:"..table.concat(param.get_list("option_ignore_area", atom.string), "|")
 end
 
-if not options_string then
-  options_string = "issue_created:* issue_finished_after_voting:* issue_accepted:* issue_voting_started:* suggestion_created:* issue_canceled:* initiative_created:* issue_finished_without_voting:* draft_created:* initiative_revoked:* issue_half_frozen:* "
-end
-
 local setting_key = "liquidfeedback_frontend_timeline_current_options"
 local setting = Setting:by_pk(app.session.member.id, setting_key)