0
@@ -779,8 +779,8 @@ class TodosController < ApplicationController
0
     if todo.from_recurring_todo?
0
       recurring_todo = todo.recurring_todo
0
 
0
-      # check if there are active todos belonging to this recurring todo.
0
-      # only add new one if all active todos are completed
0
+      # check if there are active todos belonging to this recurring todo. only
0
+      # add new one if all active todos are completed
0
       if recurring_todo.todos.active.count == 0
0
       
0
         # check for next todo either from the due date or the show_from date
0
@@ -788,7 +788,7 @@ class TodosController < ApplicationController
0
       
0
         # if both due and show_from are nil, check for a next todo from now
0
         date_to_check = Time.zone.now if date_to_check.nil?
0
-      
0
+
0
         if recurring_todo.active? && recurring_todo.has_next_todo(date_to_check)
0
         
0
           # shift the reference date to yesterday if date_to_check is furher in
0
@@ -799,7 +799,7 @@ class TodosController < ApplicationController
0
           # that new todos due for today will be created instead of new todos
0
           # for tomorrow.
0
           date = date_to_check.at_midnight >= Time.zone.now.at_midnight ? date_to_check : Time.zone.now-1.day
0
-        
0
+
0
           new_recurring_todo = create_todo_from_recurring_todo(recurring_todo, date)
0
         end
0
       end

0
@@ -471,12 +471,23 @@ class RecurringTodo < ActiveRecord::Base
0
     start = determine_start(previous)
0
     day = self.every_other1
0
     n = self.every_other2
0
-    
0
+
0
     case self.recurrence_selector
0
     when 0 # specific day of the month
0
-      if start.mday >= day  
0
+      if start.mday >= day
0
         # there is no next day n in this month, search in next month
0
-        start += n.months
0
+        #  
0
+        #  start += n.months
0
+        # 
0
+        # The above seems to not work. Fiddle with timezone. Looks like we hit a
0
+        # bug in rails here where 2008-12-01 +0100 plus 1.month becomes
0
+        # 2008-12-31 +0100. For now, just calculate in UTC and convert back to
0
+        # local timezone.
0
+        #  
0
+        #  TODO: recheck if future rails versions have this problem too
0
+        start = Time.utc(start.year, start.month, start.day)+n.months
0
+        start = Time.zone.local(start.year, start.month, start.day)
0
+
0
         # go back to day
0
       end
0
       return Time.zone.local(start.year, start.month, day)