From a27c1faa9fb879065de232641338bedcb7d563e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C5=A0koda?= <commits@skodak.org>
Date: Tue, 7 Jan 2014 10:35:13 +0800
Subject: [PATCH] MDL-43488 remoe city and country requirement from signup

This was supposed to be part of MDL-28558.
---
 login/signup_form.php | 2 --
 1 file changed, 2 deletions(-)

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);