From eea3341dfc5aee7a96d665ea22185f80ac4130db Mon Sep 17 00:00:00 2001
From: Aparup Banerjee <aparup@moodle.com>
Date: Tue, 28 Jun 2011 18:53:04 +0800
Subject: [PATCH] MDL-28044 general - updated print_error() link to point to
 new versioned docs link.

---
 lib/setuplib.php | 44 +++++++++++++++++++++++++++++++++++++++-----
 lib/weblib.php   | 36 ------------------------------------
 2 files changed, 39 insertions(+), 41 deletions(-)

diff --git a/lib/setuplib.php b/lib/setuplib.php
index 63e062cb02d..aeae850b8a3 100644
--- a/lib/setuplib.php
+++ b/lib/setuplib.php
@@ -480,18 +480,17 @@ function get_exception_info($ex) {
     }
 
     if (!empty($CFG->errordocroot)) {
-        $errordocroot = $CFG->errordocroot;
-    } else if (!empty($CFG->docroot)) {
-        $errordocroot = $CFG->docroot;
+        $errordoclink = $CFG->errordocroot . '/en/';
     } else {
-        $errordocroot = 'http://docs.moodle.org';
+        $errordoclink = get_docs_url();
     }
+
     if ($module === 'error') {
         $modulelink = 'moodle';
     } else {
         $modulelink = $module;
     }
-    $moreinfourl = $errordocroot . '/en/error/' . $modulelink . '/' . $errorcode;
+    $moreinfourl = $errordoclink . 'error/' . $modulelink . '/' . $errorcode;
 
     if (empty($link)) {
         if (!empty($SESSION->fromurl)) {
@@ -514,6 +513,41 @@ function get_exception_info($ex) {
     return $info;
 }
 
+/**
+ * Returns the Moodle Docs URL in the users language
+ *
+ * @global object
+ * @param string $path the end of the URL.
+ * @return string The MoodleDocs URL in the user's language. for example {@link http://docs.moodle.org/en/ http://docs.moodle.org/en/$path}
+ */
+function get_docs_url($path=null) {
+    global $CFG;
+    // Check that $CFG->release has been set up, during installation it won't be.
+    if (empty($CFG->release)) {
+        // It's not there yet so look at version.php
+        include($CFG->dirroot.'/version.php');
+    } else {
+        // We can use $CFG->release and avoid having to include version.php
+        $release = $CFG->release;
+    }
+    // Attempt to match the branch from the release
+    if (preg_match('/^(.)\.(.)/', $release, $matches)) {
+        // We should ALWAYS get here
+        $branch = $matches[1].$matches[2];
+    } else {
+        // We should never get here but in case we do lets set $branch to .
+        // the smart one's will know that this is the current directory
+        // and the smarter ones will know that there is some smart matching
+        // that will ensure people end up at the latest version of the docs.
+        $branch = '.';
+    }
+    if (!empty($CFG->docroot)) {
+        return $CFG->docroot . '/' . $branch . '/' . current_language() . '/' . $path;
+    } else {
+        return 'http://docs.moodle.org/'. $branch . '/en/' . $path;
+    }
+}
+
 /**
  * Formats a backtrace ready for output.
  *
diff --git a/lib/weblib.php b/lib/weblib.php
index 290cf533d8b..60f003959a9 100644
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -2807,42 +2807,6 @@ function convert_tabrows_to_tree($tabrows, $selected, $inactive, $activated) {
     return $subtree;
 }
 
-/**
- * Returns the Moodle Docs URL in the users language
- *
- * @global object
- * @param string $path the end of the URL.
- * @return string The MoodleDocs URL in the user's language. for example {@link http://docs.moodle.org/en/ http://docs.moodle.org/en/$path}
- */
-function get_docs_url($path) {
-    global $CFG;
-    // Check that $CFG->release has been set up, during installation it won't be.
-    if (empty($CFG->release)) {
-        // It's not there yet so look at version.php
-        include($CFG->dirroot.'/version.php');
-    } else {
-        // We can use $CFG->release and avoid having to include version.php
-        $release = $CFG->release;
-    }
-    // Attempt to match the branch from the release
-    if (preg_match('/^(.)\.(.)/', $release, $matches)) {
-        // We should ALWAYS get here
-        $branch = $matches[1].$matches[2];
-    } else {
-        // We should never get here but in case we do lets set $branch to .
-        // the smart one's will know that this is the current directory
-        // and the smarter ones will know that there is some smart matching
-        // that will ensure people end up at the latest version of the docs.
-        $branch = '.';
-    }
-    if (!empty($CFG->docroot)) {
-        return $CFG->docroot . '/' . $branch . '/' . current_language() . '/' . $path;
-    } else {
-        return 'http://docs.moodle.org/'. $branch . '/en/' . $path;
-    }
-}
-
-
 /**
  * Standard Debugging Function
  *