MDL-13489 Merged fixes from 1.9

diff --git a/admin/environment.xml b/admin/environment.xml
index 6216b1dc6eebc254d34e54b05ceca462333134a1..ecb0260b759ffeed2f8a9d28736f74770d88e9ba 100644 (file)
--- a/admin/environment.xml
+++ b/admin/environment.xml
@@ -117,6 +117,11 @@
           <ON_CHECK message="tokenizerrecommended" />
         </FEEDBACK>
       </PHP_EXTENSION>
+      <PHP_EXTENSION name="xmlrpc" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="xmlrpcrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
     </PHP_EXTENSIONS>
   </MOODLE>
   <MOODLE version="1.9">
@@ -167,6 +172,11 @@
           <ON_CHECK message="tokenizerrecommended" />
         </FEEDBACK>
       </PHP_EXTENSION>
+      <PHP_EXTENSION name="xmlrpc" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="xmlrpcrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
     </PHP_EXTENSIONS>
     <CUSTOM_CHECKS>
       <CUSTOM_CHECK file="question/upgrade.php" function="question_check_no_rqp_questions" level="optional">
@@ -234,6 +244,11 @@
           <ON_CHECK message="tokenizerrecommended" />
         </FEEDBACK>
       </PHP_EXTENSION>
+      <PHP_EXTENSION name="xmlrpc" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="xmlrpcrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
     </PHP_EXTENSIONS>
     <CUSTOM_CHECKS>
       <CUSTOM_CHECK file="question/upgrade.php" function="question_check_no_rqp_questions" level="optional">

diff --git a/install.php b/install.php
index cade4969a8f1c22a1119b6a4cfbd256539ea7d2f..f0807e922c52b1dd48e32fa5663640ec6c21993f 100644 (file)
--- a/install.php
+++ b/install.php
@@ -132,6 +132,7 @@ $CFG->dataroot = $INSTALL['dataroot'];
 $CFG->admin = $INSTALL['admindirname'];
 $CFG->directorypermissions = 00777;
 $CFG->running_installer = true;
+$CFG->docroot = 'http://docs.moodle.org';
 $COURSE->id = 0;
 
 /// Include some moodle libraries

diff --git a/lang/en_utf8/admin.php b/lang/en_utf8/admin.php
index dedeabdb94b0690a776600e3d237c50d2fae90a0..5f3363afc25d2ecb1511a9cbc386fe7f79ba1cf0 100644 (file)
--- a/lang/en_utf8/admin.php
+++ b/lang/en_utf8/admin.php
@@ -727,6 +727,7 @@ $string['validateerror'] = 'This value was not valid:';
 $string['warningcurrentsetting'] = 'Invalid current value: $a';
 $string['webproxy'] = 'Web proxy';
 $string['webproxyinfo'] = 'Fill in following options if your Moodle server can not access internet directly. Internet access is required for download of environment data, language packs, RSS feeds, timezones, etc.<br /><em>PHP cURL extension is highly recommended.</em>';
+$string['xmlrpcrecommended'] = 'Installing the optional xmlrpc extension is useful for Moodle Networking functionality.';
 $string['xmlstrictheaders'] = 'XML strict headers';
 
 ?>