projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'xorg/maint' into xorg/master
[platal.git]
/
modules
/
reminder.php
diff --git
a/modules/reminder.php
b/modules/reminder.php
index
d150f58
..
a395c4d
100644
(file)
--- a/
modules/reminder.php
+++ b/
modules/reminder.php
@@
-1,6
+1,6
@@
<?php
/***************************************************************************
<?php
/***************************************************************************
- * Copyright (C) 2003-20
09
Polytechnique.org *
+ * Copyright (C) 2003-20
11
Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-24,11
+24,11
@@
class ReminderModule extends PLModule
function handlers()
{
return array(
function handlers()
{
return array(
- 'ajax/reminder' => $this->make_hook('reminder', AUTH_COOKIE),
+ 'ajax/reminder' => $this->make_hook('reminder', AUTH_COOKIE
, 'user'
),
);
}
);
}
- function handler_reminder(
&
$page, $reminder_name = null, $action = null)
+ function handler_reminder($page, $reminder_name = null, $action = null)
{
require_once 'reminder.inc.php';
$user = S::user();
{
require_once 'reminder.inc.php';
$user = S::user();
@@
-44,10
+44,12
@@
class ReminderModule extends PLModule
// displayed.
$reminder->HandleAction($action);
// displayed.
$reminder->HandleAction($action);
- if ($new_reminder = Reminder::GetCandidateReminder($user)) {
- $new_reminder->Display($page);
+ $previous_reminder = $reminder->title();
+
+ if (($new_reminder = Reminder::GetCandidateReminder($user))) {
+ $new_reminder->DisplayStandalone($page, $previous_reminder);
} else {
} else {
-
exit
;
+
$reminder->NotifiesAction($page)
;
}
}
}
}
}
}