[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7509]
From: |
Erik Holm-Larsen |
Subject: |
[Fmsystem-commits] [7509] |
Date: |
Wed, 17 Aug 2011 10:20:15 +0000 |
Revision: 7509
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7509
Author: erikhl
Date: 2011-08-17 10:20:15 +0000 (Wed, 17 Aug 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/activitycalendar/inc/class.soactivity.inc.php
trunk/activitycalendar/inc/class.uiimport.inc.php
trunk/activitycalendar/setup/setup.inc.php
trunk/activitycalendarfrontend/setup/setup.inc.php
Modified: trunk/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soactivity.inc.php 2011-08-17 09:11:46 UTC
(rev 7508)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2011-08-17 10:20:15 UTC
(rev 7509)
@@ -830,6 +830,10 @@
$city = '';
}
$district = $org_info['district'];
+ if(!$district)
+ {
+ $district = '';
+ }
$activity_id = $org_info['activity_id'];
$show_in_portal = 1;
Modified: trunk/activitycalendar/inc/class.uiimport.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiimport.inc.php 2011-08-17 09:11:46 UTC
(rev 7508)
+++ trunk/activitycalendar/inc/class.uiimport.inc.php 2011-08-17 10:20:15 UTC
(rev 7509)
@@ -217,6 +217,7 @@
unset($contact2);
unset($contact3);
unset($contact4);
+ unset($new_group_id);
$internal_arena = $this->decode($data[9]);
if($internal_arena)
Modified: trunk/activitycalendar/setup/setup.inc.php
===================================================================
--- trunk/activitycalendar/setup/setup.inc.php 2011-08-17 09:11:46 UTC (rev
7508)
+++ trunk/activitycalendar/setup/setup.inc.php 2011-08-17 10:20:15 UTC (rev
7509)
@@ -40,7 +40,10 @@
$setup_info['activitycalendar']['tables'] = array(
'activity_activity',
- 'activity_arena'
+ 'activity_arena',
+ 'activity_organization',
+ 'activity_group',
+ 'activity_contact_person'
);
Modified: trunk/activitycalendarfrontend/setup/setup.inc.php
===================================================================
--- trunk/activitycalendarfrontend/setup/setup.inc.php 2011-08-17 09:11:46 UTC
(rev 7508)
+++ trunk/activitycalendarfrontend/setup/setup.inc.php 2011-08-17 10:20:15 UTC
(rev 7509)
@@ -31,7 +31,7 @@
$setup_info['activitycalendarfrontend']['depends'][] = array(
'appname' => 'activitycalendar',
- 'versions' => Array('0.1.3','0.1.4')
+ 'versions' => Array('0.1.3','0.1.4','0.1.5')
);
/* The hooks this app includes, needed for hooks registration */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7509],
Erik Holm-Larsen <=