[Fmsystem-commits] [14476]

[Nelson Guerra]

Revision: 14476
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14476
Author:   nelson224
Date:     2015-11-25 23:53:00 +0000 (Wed, 25 Nov 2015)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind/activitycalendar/inc/class.uiactivities.inc.php

Modified: 
branches/dev-syncromind/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- branches/dev-syncromind/activitycalendar/inc/class.uiactivities.inc.php     
2015-11-25 23:52:37 UTC (rev 14475)
+++ branches/dev-syncromind/activitycalendar/inc/class.uiactivities.inc.php     
2015-11-25 23:53:00 UTC (rev 14476)
@@ -430,9 +430,9 @@
                                case 'new_activities':
                                        $filters                 = 
array('new_activities' => 'yes', 'activity_state' => 
phpgw::get_var('activity_state'),
                                                'activity_category' => 
phpgw::get_var('activity_category'), 'activity_district' => 
phpgw::get_var('activity_district'),
-                                               'user_id' => $uid, 
'updated_date_hidden' => phpgw::get_var('date_change_hidden'));
+                                               'user_id' => $uid, 
'updated_date_hidden' => phpgw::get_var('date_change'));
                                        $result_objects  = 
activitycalendar_soactivity::get_instance()->get($start_index, $num_of_objects, 
$sort_field, $sort_ascending, $search_for, $search_type, $filters);
-                                       $result_count    = 
activitycalendar_soactivity::get_instance()->get_count($search_for, 
$search_type, $filters);
+                                       $result_count    = 
activitycalendar_soactivity::get_instance()->get_count($search_for, 
$search_type, $filters);                         
                                        break;
                                case 'all_activities':
                                default:
@@ -684,6 +684,12 @@
                                }
                        }
 
+                       if (phpgw::get_var('phpgw_return_as') == 'json')
+                       {
+                               $message['message'][] = 
array('msg'=>lang('E-post sendt'));
+                               return $message;
+                       }
+               
                        $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'activitycalendar.uiactivities.index',
                                'message' => 'E-post sendt'));
                }