diff --git a/inc/class.schedule.php b/inc/class.schedule.php
--- a/inc/class.schedule.php
+++ b/inc/class.schedule.php
@@ -510,7 +510,7 @@ class Schedule
if ($schedule_store !== NULL
&& $this->parent_get() !== NULL
&& ($parent_schedule = schedule_store_retrieve($schedule_store, $this->parent_get())) !== NULL)
- echo ' Parent' . PHP_EOL;
+ echo ' Parent' . PHP_EOL;
echo ' Home' . PHP_EOL
. '
'. PHP_EOL
@@ -612,11 +612,11 @@ class Schedule
echo " \n";
@@ -877,15 +877,15 @@ class Schedule
* Takes into account the $clean_urls setting.
*
* \param $id
- * The ID of the schedule to link to. Defaults to the current schedule object.
+ * The ID of the schedule to link to.
* \param $page
- * The page of the schedule to link to. Defaults to 0.
+ * The page/tab of the schedule to link to. Defaults to 0.
* \return
- * A string, the URL used to access this schedule. Remember that
- * if this string is inserted into an XHTML document,
- * htmlentities() must be called on it.
+ * A string, the URL used to access the specified
+ * schedule. Remember that if this string is inserted into an
+ * XHTML document, htmlentities() must be called on it.
*/
- function url($id = NULL, $page = 0)
+ public static function url($id, $page = 0)
{
global $clean_urls;
@@ -893,8 +893,6 @@ class Schedule
if (!$clean_urls)
$url .= 'process.php?s=';
- if (!$id)
- $id = $this->id;
$url .= (int)$id;
if ($clean_urls)
$url .= '?';
@@ -909,6 +907,23 @@ class Schedule
/**
* \brief
+ * Return the URL used to access this schedule.
+ *
+ * Convenience wrapper around Schedule::url().
+ *
+ * \param $page
+ * Which page (tab) of the schedule to link to.
+ * \return
+ * A raw URL (one that must be htmlentities()ized before putting
+ * into HTML).
+ */
+ public function my_url($page = 0)
+ {
+ return Schedule::url($this->id, $page);
+ }
+
+ /**
+ * \brief
* Get the ID of the schedule from which this schedule was
* derived.
*/
diff --git a/process.php b/process.php
--- a/process.php
+++ b/process.php
@@ -260,7 +260,7 @@ if(!$DEBUG)
if ($schedule_id != NULL)
$_SESSION['saved'][$schedule_id] = $allClasses->getName();
- page::redirect($allClasses->url());
+ page::redirect($allClasses->my_url());
exit;
}
}