Revision: 18622 http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=18622 Author: johang Date: 2008-06-25 17:39:16 +0000 (Wed, 25 Jun 2008)
Log Message: ----------- * Deleting calendar items now work again. * Fix typo/undeclared property warning. Modified Paths: -------------- trunk/calendar/inc/class.uicalendar.inc.php Modified: trunk/calendar/inc/class.uicalendar.inc.php =================================================================== --- trunk/calendar/inc/class.uicalendar.inc.php 2008-06-24 14:09:05 UTC (rev 18621) +++ trunk/calendar/inc/class.uicalendar.inc.php 2008-06-25 17:39:16 UTC (rev 18622) @@ -1045,12 +1045,13 @@ function delete() { - if ( phpgw::get_var('cal_id', 'int', 'GET') ) + if ( !phpgw::get_var('cal_id', 'int', 'GET') ) { Header('Location: '.$this->page('', array('date' => sprintf('%04d%02d%02d', $this->bo->year, $this->bo->month, $this->bo->day) ), true) ); $GLOBALS['phpgw']->common->phpgw_exit(); } $date = sprintf('%04d%02d%02d', $this->bo->year, $this->bo->month, $this->bo->day); + $cal_id = phpgw::get_var('cal_id', 'int', 'GET'); if ( $this->bo->check_perms(PHPGW_ACL_DELETE, $cal_id) ) { @@ -2838,7 +2839,7 @@ ); $p->set_var($var); - $date = sprintf("%04d%02d%02d",$this->bo->year,$this->bo->month,$this->bo->mday); + $date = sprintf("%04d%02d%02d",$this->bo->year,$this->bo->month,$this->bo->day); $var = array( 'action_url_button' => $GLOBALS['phpgw']->link('/index.php', array('menuaction' => 'calendar.bocalendar.update', 'readsess' => 1)), 'action_text_button' => lang('Ignore Conflict'), _______________________________________________ phpGroupWare-cvs mailing list phpGroupWare-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/phpgroupware-cvs