Merge branch 'MDL-28657-master' of https://github.com/mackensen/moodle
authorAparup Banerjee <aparup@moodle.com>
Wed, 2 May 2012 05:55:39 +0000 (13:55 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 2 May 2012 05:55:39 +0000 (13:55 +0800)
1  2 
admin/settings/courses.php
lang/en/admin.php

@@@ -161,8 -138,9 +161,9 @@@ if ($hassiteconfi
          400 => '400',
          500 => '500');
      $temp->add(new admin_setting_configselect('backup/backup_auto_keep', new lang_string('keep'), new lang_string('backupkeephelp'), 1, $keepoptoins));
+     $temp->add(new admin_setting_configcheckbox('backup/backup_shortname', new lang_string('backup_shortname', 'admin'), new lang_string('backup_shortnamehelp', 'admin'), 0));
  
 -
 +    // Automated defaults section.
      $temp->add(new admin_setting_heading('automatedsettings', new lang_string('automatedsettings','backup'), ''));
      $temp->add(new admin_setting_configcheckbox('backup/backup_auto_users', new lang_string('generalusers', 'backup'), new lang_string('configgeneralusers', 'backup'), 1));
      $temp->add(new admin_setting_configcheckbox('backup/backup_auto_role_assignments', new lang_string('generalroleassignments','backup'), new lang_string('configgeneralroleassignments','backup'), 1));
Simple merge