L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

outputlib: MDL-20631 link_to_popup throws an exception if $link->text is empty, but you have passed an $image.

Browse Source
This commit is contained in:
Tim Hunt
2009-10-23 18:49:00 +00:00
parent 1a9def7cc2
commit 02f64f9790
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/outputrenderers.php
+15 -15
View File
@@ -1333,21 +1333,6 @@ class moodle_core_renderer extends moodle_renderer_base {
*/
public function link_to_popup($link, $image=null) {
$link = clone($link);
$link->prepare();
$this->prepare_event_handlers($link);
if (empty($link->url)) {
throw new coding_exception('Called $OUTPUT->link_to_popup($link) method without $link->url set.');
}
$linkurl = prepare_url($link->url);
$tagoptions = array(
'title' => $link->title,
'id' => $link->id,
'href' => ($linkurl) ? $linkurl : prepare_url($popup->url),
'class' => $link->get_classes_string());
// Use image if one is given
if (!empty($image) && $image instanceof html_image) {
@@ -1364,6 +1349,21 @@ class moodle_core_renderer extends moodle_renderer_base {
}
}
$link->prepare();
$this->prepare_event_handlers($link);
if (empty($link->url)) {
throw new coding_exception('Called $OUTPUT->link_to_popup($link) method without $link->url set.');
}
$linkurl = prepare_url($link->url);
$tagoptions = array(
'title' => $link->title,
'id' => $link->id,
'href' => ($linkurl) ? $linkurl : prepare_url($popup->url),
'class' => $link->get_classes_string());
return $this->output_tag('a', $tagoptions, $link->text);
}