From 7bd95129d38bc9f2132e4dd409aa509206437b18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C5=A0koda?= <commits@skodak.org>
Date: Sun, 29 Dec 2013 16:17:52 +0800
Subject: [PATCH] MDL-43488 remoe city and country requirement from signup

This was supposed to be part of MDL-28558.
---
 lang/en/moodle.php    | 2 --
 login/signup_form.php | 2 --
 2 files changed, 4 deletions(-)

diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index da2502e370e..9c08415ee5c 100644
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -1121,8 +1121,6 @@ $string['minute'] = 'minute';
 $string['minutes'] = 'minutes';
 $string['miscellaneous'] = 'Miscellaneous';
 $string['missingcategory'] = 'You need to choose a category';
-$string['missingcity'] = 'Missing city/town';
-$string['missingcountry'] = 'Missing country';
 $string['missingdescription'] = 'Missing description';
 $string['missingemail'] = 'Missing email address';
 $string['missingfirstname'] = 'Missing given name';
diff --git a/login/signup_form.php b/login/signup_form.php
index 3422c8d91d7..71ad670a123 100644
--- a/login/signup_form.php
+++ b/login/signup_form.php
@@ -73,7 +73,6 @@ class login_signup_form extends moodleform {
 
         $mform->addElement('text', 'city', get_string('city'), 'maxlength="120" size="20"');
         $mform->setType('city', PARAM_TEXT);
-        $mform->addRule('city', get_string('missingcity'), 'required', null, 'server');
         if (!empty($CFG->defaultcity)) {
             $mform->setDefault('city', $CFG->defaultcity);
         }
@@ -82,7 +81,6 @@ class login_signup_form extends moodleform {
         $default_country[''] = get_string('selectacountry');
         $country = array_merge($default_country, $country);
         $mform->addElement('select', 'country', get_string('country'), $country);
-        $mform->addRule('country', get_string('missingcountry'), 'required', null, 'server');
 
         if( !empty($CFG->country) ){
             $mform->setDefault('country', $CFG->country);