MDL-19793 Upgraded calls to link_to_popup_window()

diff --git a/calendar/event_edit.html b/calendar/event_edit.html
index bc5da929d9edda8c7f0b8c1edf33879e04a7a891..2abf510e3b6c2950ed7baea7df153d3ff8e2f4ee 100644 (file)
--- a/calendar/event_edit.html
+++ b/calendar/event_edit.html
@@ -21,7 +21,7 @@ $endselectors = html_select::make_time_selectors(array(
     </td>
     <td>
       <input type="text" name="name" size="67" value="<?php p($form->name); ?>" />
-      <?php if (isset($err['name'])) formerr($err['name']); ?>
+      <?php if (isset($err['name'])) echo $OUTPUT->error_text($err['name']); ?>
     </td>
   </tr>
   <tr>
@@ -31,7 +31,7 @@ $endselectors = html_select::make_time_selectors(array(
     <td>
       <?php
           print_textarea($usehtmleditor, 20, 65, 630, 300, "description", $form->description);
-          if (isset($err['description'])) formerr($err['description']);
+          if (isset($err['description'])) echo $OUTPUT->error_text($err['description']);
       ?>
     </td>
   </tr>
@@ -41,7 +41,7 @@ $endselectors = html_select::make_time_selectors(array(
       <?php echo $OUTPUT->select($startselectors[0]) . $OUTPUT->select($startselectors[1]) . $OUTPUT->select($startselectors[2]);?>
       <?php print_string('eventtime', 'calendar');?>
       <?php echo $OUTPUT->select($startselectors[3]) . $OUTPUT->select($startselectors[4]);?>
-      <?php if (isset($err['timestart'])) formerr($err['timestart']); ?>
+      <?php if (isset($err['timestart'])) echo $OUTPUT->error_text($err['timestart']); ?>
     </td>
   </tr>
   <tr>
@@ -63,13 +63,13 @@ $endselectors = html_select::make_time_selectors(array(
         <?php echo $OUTPUT->select($endselectors[0]) . $OUTPUT->select($endselectors[1]) . $OUTPUT->select($endselectors[2]);?>
         <?php print_string('eventtime', 'calendar');?>
         <?php echo $OUTPUT->select($endselectors[3]) . $OUTPUT->select($endselectors[4]);?>
-        <?php if (isset($err['timeduration'])) formerr($err['timeduration']); ?>
+        <?php if (isset($err['timeduration'])) echo $OUTPUT->error_text($err['timeduration']); ?>
       </div>
       <div>
         <input type="radio" name="duration" value="2" id="duration_minutes" <?php if($form->duration == 2) echo 'checked="checked"'; ?>/>
         <label for="duration_minutes"><?php print_string('durationminutes', 'calendar'); ?>:</label>
         <input type="text" name="minutes" size="3" value="<?php p($form->minutes); ?>" />
-        <?php if (isset($err['minutes'])) formerr($err['minutes']); ?>
+        <?php if (isset($err['minutes'])) echo $OUTPUT->error_text($err['minutes']); ?>
       </div>
     </td>
   </tr>

diff --git a/calendar/event_new.html b/calendar/event_new.html
index b6c6ad9943a66e34771cb88755da87ba7fb75c23..9309e31d2e2ee794b8b8f8f657023739c37ef6a1 100644 (file)
--- a/calendar/event_new.html
+++ b/calendar/event_new.html
@@ -23,7 +23,7 @@
     </label></td>
     <td>
       <input type="text" name="name" size="67" id="eventname" value="<?php p($form->name); ?>" />
-      <?php if (isset($err['name'])) formerr($err['name']); ?>
+      <?php if (isset($err['name'])) echo $OUTPUT->error_text($err['name']); ?>
     </td>
   </tr>
   <tr>
@@ -33,7 +33,7 @@
     <td>
     <?php
         print_textarea($usehtmleditor, 20, 65, 630, 300, "description", $form->description);
-        if (isset($err['description'])) formerr($err['description']);
+        if (isset($err['description'])) echo $OUTPUT->error_text($err['description']);
     ?>
     </td>
   </tr>
@@ -45,7 +45,7 @@
       <?php echo $OUTPUT->select($startselectors[0]) . $OUTPUT->select($startselectors[1]) . $OUTPUT->select($startselectors[2]);?>
       <?php print_string('eventtime', 'calendar');?>
       <?php echo $OUTPUT->select($startselectors[3]) . $OUTPUT->select($startselectors[4]);?>
-      <?php if (isset($err['timestart'])) formerr($err['timestart']); ?>
+      <?php if (isset($err['timestart'])) echo $OUTPUT->error_text($err['timestart']); ?>
     </td>
   </tr>
   <tr>
@@ -63,13 +63,13 @@
         <?php echo $OUTPUT->select($endselectors[0]) . $OUTPUT->select($endselectors[1]) . $OUTPUT->select($endselectors[2]);?>
         <?php print_string('eventtime', 'calendar');?>
         <?php echo $OUTPUT->select($endselectors[3]) . $OUTPUT->select($endselectors[4]);?>
-        <?php if (isset($err['timeduration'])) formerr($err['timeduration']); ?>
+        <?php if (isset($err['timeduration'])) echo $OUTPUT->error_text($err['timeduration']); ?>
       </div>
       <div>
         <input type="radio" name="duration" value="2" id="duration_minutes" <?php if($form->duration == 2) echo 'checked="checked"'; ?>/>
         <label for="duration_minutes"><?php print_string('durationminutes', 'calendar'); ?></label>
         <input type="text" name="minutes" size="3" value="<?php p($form->minutes); ?>" id="minutes"/>
-        <?php if (isset($err['minutes'])) formerr($err['minutes']); ?>
+        <?php if (isset($err['minutes'])) echo $OUTPUT->error_text($err['minutes']); ?>
         <label class="accesshide" for="minutes"><?php print_string('minutes') ?></label>
       </div>
     </td>
@@ -93,7 +93,7 @@
         </label>
         <input id="repeats" type="text" name="repeats" size="2" value="<?php p($form->repeats); ?>" />
         <label for="repeats"><?php print_string('repeatweeksr', 'calendar'); ?></label>
-        <?php if (isset($err['repeats'])) formerr($err['repeats']); ?>
+        <?php if (isset($err['repeats'])) echo $OUTPUT->error_text($err['repeats']); ?>
       </div>
     </td>
   </tr>