From 02f64f9790bfab5a8cbd8feb3920e9542a6d307f Mon Sep 17 00:00:00 2001 From: Tim Hunt Date: Fri, 23 Oct 2009 18:49:00 +0000 Subject: [PATCH] outputlib: MDL-20631 link_to_popup throws an exception if $link->text is empty, but you have passed an $image. --- lib/outputrenderers.php | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php index 358a97608c..02e26589c1 100644 --- a/lib/outputrenderers.php +++ b/lib/outputrenderers.php @@ -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); } -- 2.39.5