From: jerome <jerome>
Date: Thu, 8 May 2008 02:38:38 +0000 (+0000)
Subject: MDL-12648 Undefined property: stdClass::$wwwroot on popup screen during installation... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=450522e374097e27cf724209b6f8e0c6473b6ce9;p=moodle.git

MDL-12648 Undefined property: stdClass::$wwwroot on popup screen during installation, merged from 19
---

diff --git a/lib/weblib.php b/lib/weblib.php
index c9ef750e9c..ec287ffdf6 100644
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -749,7 +749,7 @@ function close_window_button($name='closewindow', $return=false) {
     $output = '';
 
     $output .= '<div class="closewindow">' . "\n";
-    $output .= '<form action="'.$CFG->wwwroot.'"><div>';   // We don't use this
+    $output .= '<form action="#"><div>';
     $output .= '<input type="button" onclick="self.close();" value="'.get_string($name).'" />';
     $output .= '</div></form>';
     $output .= '</div>' . "\n";
@@ -6751,7 +6751,7 @@ function page_doc_link($text='', $iconpath='') {
  */
 function doc_link($path='', $text='', $iconpath='') {
     global $CFG;
-
+    
     if (empty($CFG->docroot)) {
         return '';
     }
@@ -6769,7 +6769,7 @@ function doc_link($path='', $text='', $iconpath='') {
 
     $str = "<a href=\"$url\"$target>";
 
-    if (empty($iconpath)) {
+    if (empty($iconpath)) { 
         $iconpath = $CFG->httpswwwroot . '/pix/docs.gif';
     }