Merge branch 'master' of /home/jason/dev/git/wfpl

[wfpl.git] / calendar.php

diff --git a/calendar.php b/calendar.php
index 6082989..d9a7d29 100644 (file)
--- a/calendar.php
+++ b/calendar.php
@@ -37,12 +37,6 @@
 # The html and CSS is completely customizable without opening a php file.
 
 
-# ACKNOWLEDGMENTS
-#
-# Thank you Oscar Merida for figuring out the necessary date() and strftime()
-# calls: http://freshmeat.net/projects/simplephpcalendar/
-
-
 
 require_once('code/wfpl/template.php');
 
@@ -55,9 +49,16 @@ function calendar_day($kind, &$template) {
        $template->sub('day');
 }
 
-function calendar($year, $month, $events = 0, &$template = 0) {
-       if($template == 0) {
-               $template = $GLOBALS['wfpl_template'];
+# php4 is broken, in that you cannot set a default value for a parameter that
+# is passed by reference. So, this is set up to use the following screwy
+# syntax:
+#
+# calendar('2006', '12', $events, ref($my_template))
+function calendar($year, $month, $events = 0, $template = 0) {
+       if($template === 0) {
+               $template = &$GLOBALS['wfpl_template'];
+       } else {
+               $template = &$template->ref;
        }
 
        if(strlen($year) == 2) {