Skip to content
Browse files

Merge branch 'w11_MDL-26698_20_helphttps' of git://github.com/skodak/…

…moodle
  • Loading branch information...
2 parents 3c38ad5 + 69542fb commit 64f3208b7c3955424dac232e22c1c1fa651f6db5 @stronk7 stronk7 committed Mar 14, 2011
Showing with 4 additions and 4 deletions.
  1. +4 −4 lib/outputrenderers.php
View
8 lib/outputrenderers.php
@@ -1648,8 +1648,8 @@ protected function render_old_help_icon(old_help_icon $helpicon) {
$output .= $helpicon->linktext;
}
- // now create the link around it
- $url = new moodle_url('/help.php', array('component' => $helpicon->component, 'identifier' => $helpicon->helpidentifier, 'lang'=>current_language()));
+ // now create the link around it - we need https on loginhttps pages
+ $url = new moodle_url($CFG->httpswwwroot.'/help.php', array('component' => $helpicon->component, 'identifier' => $helpicon->helpidentifier, 'lang'=>current_language()));
// note: this title is displayed only if JS is disabled, otherwise the link will have the new ajax tooltip
$title = get_string('helpprefix2', '', trim($helpicon->title, ". \t"));
@@ -1712,8 +1712,8 @@ protected function render_help_icon(help_icon $helpicon) {
$output .= $helpicon->linktext;
}
- // now create the link around it
- $url = new moodle_url('/help.php', array('component' => $helpicon->component, 'identifier' => $helpicon->identifier, 'lang'=>current_language()));
+ // now create the link around it - we need https on loginhttps pages
+ $url = new moodle_url($CFG->httpswwwroot.'/help.php', array('component' => $helpicon->component, 'identifier' => $helpicon->identifier, 'lang'=>current_language()));
// note: this title is displayed only if JS is disabled, otherwise the link will have the new ajax tooltip
$title = get_string('helpprefix2', '', trim($title, ". \t"));

0 comments on commit 64f3208

Please sign in to comment.
Something went wrong with that request. Please try again.