Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'w07_MDL-25778_20_defaultcity' of git://github.com/skoda…

…k/moodle
  • Loading branch information...
commit da622b497b0c443c2c07d1b9726d0ff97d3a34b8 2 parents 9aaa767 + 9449d0c
@stronk7 stronk7 authored
View
4 admin/uploaduser.php
@@ -572,10 +572,6 @@
$user->timemodified = time();
$user->timecreated = time();
- if (!empty($CFG->defaultcity) and !property_exists($user, 'city')) {
- $user->city = $CFG->defaultcity;
- }
-
if (isset($user->auth) && empty($user->auth)) {
$user->auth = 'manual';
}
View
12 admin/uploaduser_form.php
@@ -206,10 +206,18 @@ function definition (){
$mform->addElement('text', 'city', get_string('city'), 'maxlength="100" size="25"');
$mform->setType('city', PARAM_MULTILANG);
- $mform->setDefault('city', $templateuser->city);
+ if (empty($CFG->defaultcity)) {
+ $mform->setDefault('city', $templateuser->city);
+ } else {
+ $mform->setDefault('city', $CFG->defaultcity);
+ }
$mform->addElement('select', 'country', get_string('selectacountry'), get_string_manager()->get_list_of_countries());
- $mform->setDefault('country', $templateuser->country);
+ if (empty($CFG->country)) {
+ $mform->setDefault('country', $templateuser->country);
+ } else {
+ $mform->setDefault('country', $CFG->country);
+ }
$mform->setAdvanced('country');
$choices = get_list_of_timezones();
View
4 auth/db/auth.php
@@ -358,10 +358,6 @@ function sync_users($do_updates=false) {
echo "\t"; print_string('auth_dbreviveduser', 'auth_db', array('name'=>$user->username, 'id'=>$user->id)); echo "\n";
} else {
- if (!empty($CFG->defaultcity) and !property_exists($user, 'city')) {
- $user->city = $CFG->defaultcity;
- }
-
$id = $DB->insert_record ('user',$user); // it is truly a new user
echo "\t"; print_string('auth_dbinsertuser','auth_db',array('name'=>$user->username, 'id'=>$id)); echo "\n";
// if relevant, tag for password generation
View
8 auth/ldap/auth.php
@@ -490,10 +490,6 @@ function user_signup($user, $notify=true) {
print_error('auth_ldap_create_error', 'auth_ldap');
}
- if (!empty($CFG->defaultcity) and !property_exists($user, 'city')) {
- $user->city = $CFG->defaultcity;
- }
-
$user->id = $DB->insert_record('user', $user);
// Save any custom profile field information
@@ -853,10 +849,6 @@ function sync_users($do_updates=true) {
$user->lang = $CFG->lang;
}
- if (!empty($CFG->defaultcity) and !property_exists($user, 'city')) {
- $user->city = $CFG->defaultcity;
- }
-
$id = $DB->insert_record('user', $user);
echo "\t"; print_string('auth_dbinsertuser', 'auth_db', array('name'=>$user->username, 'id'=>$id)); echo "\n";
if (!empty($this->config->forcechangepassword)) {
Please sign in to comment.
Something went wrong with that request. Please try again.