Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31024/functions
Modified Files:
template.php
Log Message:
[ 1046871 ] Quick fix to make $show_todos work
Index: template.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** template.php 8 Oct 2004 21:20:18 -0000 1.57
--- template.php 25 Oct 2004 16:41:05 -0000 1.58
***************
*** 626,630 ****
function get_vtodo() {
! global $template, $getdate, $master_array, $next_day, $timeFormat, $tomorrows_events_lines, $show_completed;
preg_match("!<\!-- switch show_completed on -->(.*)<\!-- switch show_completed off -->!is", $this->page, $match1);
--- 626,630 ----
function get_vtodo() {
! global $template, $getdate, $master_array, $next_day, $timeFormat, $tomorrows_events_lines, $show_completed, $show_todos;
preg_match("!<\!-- switch show_completed on -->(.*)<\!-- switch show_completed off -->!is", $this->page, $match1);
***************
*** 691,695 ****
// If there are no TODO items, completely hide the TODO list.
! if ($nugget2 == '') {
$this->page = preg_replace('!<\!-- switch vtodo on -->(.*)<\!-- switch vtodo off -->!is', '', $this->page);
}
--- 691,695 ----
// If there are no TODO items, completely hide the TODO list.
! if (($nugget2 == '') || ($show_todos != 'yes')) {
$this->page = preg_replace('!<\!-- switch vtodo on -->(.*)<\!-- switch vtodo off -->!is', '', $this->page);
}
|
