"MDL-12405, add webpage to user fields, merged from MOODLE_19_STABLE"

diff --git a/admin/auth_config.php b/admin/auth_config.php
index 597305e9907bf3ce9734486bcafce4f76bb0ebfa..9d78b2e26fc43e291b994b132d998e0f759715a0 100644 (file)
--- a/admin/auth_config.php
+++ b/admin/auth_config.php
@@ -136,10 +136,11 @@ function print_auth_lock_options ($auth, $user_fields, $helptext, $retrieveopts,
             $fieldname = get_string('language');
         } elseif (preg_match('/^(.+?)(\d+)$/', $fieldname, $matches)) {
             $fieldname =  get_string($matches[1]) . ' ' . $matches[2];
+        } elseif ($fieldname == 'url') {
+            $fieldname = get_string('webpage');
         } else {
             $fieldname = get_string($fieldname);
-        }
-
+        } 
         if ($retrieveopts) {
             $varname = 'field_map_' . $field;
 

diff --git a/lib/authlib.php b/lib/authlib.php
index 971c7d68c728bdb7d4a87f73f88e75496c5c434e..70fa379959b77bf4bd2c07bdd9e9ddca62c513ec 100644 (file)
--- a/lib/authlib.php
+++ b/lib/authlib.php
@@ -63,7 +63,7 @@ class auth_plugin_base {
      */
     var $userfields = array("firstname", "lastname", "email", "phone1", "phone2", 
             "institution", "department", "address", "city", "country", 
-            "description", "idnumber", "lang");
+            "description", "idnumber", "lang", "url");
 
     /**