[Fmsystem-commits] [8141]

[Erik Holm-Larsen]

Revision: 8141
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8141
Author:   erikhl
Date:     2011-11-21 08:32:51 +0000 (Mon, 21 Nov 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/activitycalendar/inc/class.soactivity.inc.php

Modified: trunk/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soactivity.inc.php 2011-11-21 08:32:11 UTC 
(rev 8140)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2011-11-21 08:32:51 UTC 
(rev 8141)
@@ -146,7 +146,7 @@
                }
                if(isset($filters['new_activities']))
                {
-                       $filter_clauses = "activity.state=1";
+                       $filter_clauses[] = "activity.state=1 OR 
activity.state=2";
                }
                if(isset($filters['activity_state']) && 
$filters['activity_state'] != 'all'){
                        $activity_state = 
$this->marshal($filters['activity_state'],'int');