mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-17 21:49:15 +01:00
Code Issues Projects Releases Wiki Activity

Importing fixes from MOODLE_14_STABLE

Browse Source
This commit is contained in:
defacer 2004-08-26 10:52:00 +00:00
parent 0469cccfe2
commit 09d36284d1
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calendar/event.php
View File

@ -112,7 +112,7 @@
if($form = data_submitted()) {
$form->name = strip_tags($form->name); // Strip all tags
$form->description = clean_text($form->description , $form->format); // Clean up any bad tags
//$form->description = clean_text($form->description , $form->format); // Clean up any bad tags
$form->timestart = make_timestamp($form->startyr, $form->startmon, $form->startday, $form->starthr, $form->startmin);
if($form->duration == 1) {
@ -152,7 +152,7 @@
if(!empty($form) && $form->type == 'defined') {
$form->name = strip_tags($form->name); // Strip all tags
$form->description = clean_text($form->description , $form->format); // Clean up any bad tags
//$form->description = clean_text($form->description , $form->format); // Clean up any bad tags
$form->timestart = make_timestamp($form->startyr, $form->startmon, $form->startday, $form->starthr, $form->startmin);
if($form->duration == 1) {

16
calendar/lib.php
View File

@ -410,10 +410,7 @@ function calendar_sql_where($tstart, $tend, $users, $groups, $courses, $withdura
}
else if($users === false) {
// No user at all
if(!empty($whereclause)) {
$whereclause .= ' OR';
}
$whereclause .= ' 0';
// No need to do anything
}
if(is_array($groups) && !empty($groups)) {
// Events from a number of groups
@ -440,10 +437,7 @@ function calendar_sql_where($tstart, $tend, $users, $groups, $courses, $withdura
}
else {
// This means NO courses, not that we don't care!
if(!empty($whereclause)) {
$whereclause .= ' OR';
}
$whereclause .= ' 0';
// No need to do anything
}
}
else if(is_numeric($courses)) {
@ -477,7 +471,7 @@ function calendar_sql_where($tstart, $tend, $users, $groups, $courses, $withdura
$whereclause = $timeclause;
}
return $whereclause;
return empty($whereclause) ? false : $whereclause;
}
function calendar_top_controls($type, $data) {
@ -1169,10 +1163,10 @@ function calendar_format_event_time($event, $now, $morehref, $usecommonwords = t
// Set printable representation
$eventtime = calendar_get_link_tag($day, CALENDAR_URL.'view.php?view=day'.$morehref.'&', $startdate['mday'], $startdate['mon'], $startdate['year']).' ('.$time.')';
}
return $eventtime;
}
if(!function_exists('array_diff_assoc')) {
// PHP < 4.3.0
function array_diff_assoc($source, $diff) {