Merge branch 'master' of git://github.com/moodle/moodle into master_MDL-30576

admin/lib.php

@@ -35,5 +35,16 @@ function admin_page_type_list($pagetype, $parentcontext, $currentcontext) {
         'admin-*' => get_string('page-admin-x', 'pagetype'),
         $pagetype => get_string('page-admin-current', 'pagetype')
     );
+    // Add the missing * (any page) option for them. MDL-30340
+    // TODO: These pages are really 'pagetype-varying' - MDL-30564 -
+    // and some day we should stop behaving that way, so proper pagetypes
+    // can be specified for it (like course-category-* or so).
+    // Luckly... the option we are introducing '*' is independent
+    // of that varying behavior, so will work.
+    if ($pagetype == 'admin-course-category') {
+        $array += array(
+            '*' => get_string('page-x', 'pagetype')
+        );
+    }
     return $array;
-}
+}

admin/roles/admins.php

@@ -67,6 +67,26 @@ if (optional_param('add', false, PARAM_BOOL) and confirm_sesskey()) {
         }
     }
 
+} else if (optional_param('main', false, PARAM_BOOL) and confirm_sesskey()) {
+    if ($newmain = $admisselector->get_selected_users()) {
+        $newmain = reset($newmain);
+        $newmain = $newmain->id;
+        $admins = array();
+        foreach(explode(',', $CFG->siteadmins) as $admin) {
+            $admin = (int)$admin;
+            if ($admin) {
+                $admins[$admin] = $admin;
+            }
+        }
+
+        if (isset($admins[$newmain])) {
+            unset($admins[$newmain]);
+            array_unshift($admins, $newmain);
+            set_config('siteadmins', implode(',', $admins));
+            redirect($PAGE->url);
+        }
+    }
+
 } else if ($confirmadd and confirm_sesskey()) {
     $admins = array();
     foreach(explode(',', $CFG->siteadmins) as $admin) {
@@ -115,6 +135,7 @@ echo $OUTPUT->header();
         <p class="arrow_button">
             <input name="add" id="add" type="submit" value="<?php echo $OUTPUT->larrow().'&nbsp;'.get_string('add'); ?>" title="<?php print_string('add'); ?>" /><br />
             <input name="remove" id="remove" type="submit" value="<?php echo get_string('remove').'&nbsp;'.$OUTPUT->rarrow(); ?>" title="<?php print_string('remove'); ?>" />
+            <input name="main" id="main" type="submit" value="<?php echo get_string('mainadminset', 'role'); ?>" title="<?php print_string('mainadminset', 'role'); ?>" />
         </p>
       </td>
       <td id='potentialcell'>

admin/roles/lib.php

@@ -1584,13 +1584,31 @@ class admins_existing_selector extends user_selector_base {
             return array();
         }
 
-        if ($search) {
-            $groupname = get_string('extusersmatching', 'role', $search);
-        } else {
-            $groupname = get_string('extusers', 'role');
+        $mainadmin = array();
+        $adminids = explode(',', $CFG->siteadmins);
+        foreach ($adminids as $id) {
+            if (isset($availableusers[$id])) {
+                $mainadmin = array($id=>$availableusers[$id]);
+                unset($availableusers[$id]);
+                break;
+            }
         }
 
-        return array($groupname => $availableusers);
+        $result = array();
+        if ($mainadmin) {
+            $result[get_string('mainadmin', 'role')] = $mainadmin;
+        }
+
+        if ($availableusers) {
+            if ($search) {
+                $groupname = get_string('extusersmatching', 'role', $search);
+            } else {
+                $groupname = get_string('extusers', 'role');
+            }
+            $result[$groupname] = $availableusers;
+        }
+
+        return $result;
     }
 
     protected function get_options() {

admin/settings/security.php

@@ -81,6 +81,7 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
     $temp->add(new admin_setting_configcheckbox('cookiesecure', get_string('cookiesecure', 'admin'), get_string('configcookiesecure', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('cookiehttponly', get_string('cookiehttponly', 'admin'), get_string('configcookiehttponly', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('allowframembedding', get_string('allowframembedding', 'admin'), get_string('allowframembedding_help', 'admin'), 0));
+    $temp->add(new admin_setting_configcheckbox('loginpasswordautocomplete', get_string('loginpasswordautocomplete', 'admin'), get_string('loginpasswordautocomplete_help', 'admin'), 0));
     $ADMIN->add('security', $temp);
 
 

admin/tool/customlang/db/upgrade.php

@@ -29,7 +29,8 @@ function xmldb_tool_customlang_upgrade($oldversion) {
 
     $dbman = $DB->get_manager();
 
-
+    // Moodle v2.2.0 release upgrade line
+    // Put any upgrade step following this
 
     return true;
 }

auth/manual/db/upgrade.php

@@ -48,5 +48,8 @@ function xmldb_auth_manual_upgrade($oldversion) {
     // Moodle v2.1.0 release upgrade line
     // Put any upgrade step following this
 
+    // Moodle v2.2.0 release upgrade line
+    // Put any upgrade step following this
+
     return true;
 }

auth/mnet/db/upgrade.php

@@ -46,5 +46,8 @@ function xmldb_auth_mnet_upgrade($oldversion) {
     // Moodle v2.1.0 release upgrade line
     // Put any upgrade step following this
 
+    // Moodle v2.2.0 release upgrade line
+    // Put any upgrade step following this
+
     return true;
 }

blocks/community/db/upgrade.php

@@ -76,5 +76,8 @@ function xmldb_block_community_upgrade($oldversion) {
     // Moodle v2.1.0 release upgrade line
     // Put any upgrade step following this
 
+    // Moodle v2.2.0 release upgrade line
+    // Put any upgrade step following this
+
     return true;
 }

blocks/edit_form.php

@@ -93,24 +93,44 @@ class block_edit_form extends moodleform {
         $mform->addElement('static', 'bui_homecontext', get_string('createdat', 'block'), print_context_name($parentcontext));
         $mform->addHelpButton('bui_homecontext', 'createdat', 'block');
 
+        // For pre-calculated (fixed) pagetype lists
+        $pagetypelist = array();
+
         // parse pagetype patterns
         $bits = explode('-', $this->page->pagetype);
 
-        $contextoptions = array();
-        if ( ($parentcontext->contextlevel == CONTEXT_COURSE && $parentcontext->instanceid == SITEID) ||
-            ($parentcontext->contextlevel == CONTEXT_SYSTEM)) {        // Home page
-            if ($bits[0] == 'tag' || $bits[0] == 'admin') {
-                // tag and admin pages always use system context
-                // the contexts options don't make differences, so we use
-                // page type patterns only
-                $mform->addElement('hidden', 'bui_contexts', BUI_CONTEXTS_ENTIRE_SITE);
-            } else {
-                $contextoptions[BUI_CONTEXTS_FRONTPAGE_ONLY] = get_string('showonfrontpageonly', 'block');
-                $contextoptions[BUI_CONTEXTS_FRONTPAGE_SUBS] = get_string('showonfrontpageandsubs', 'block');
-                $contextoptions[BUI_CONTEXTS_ENTIRE_SITE]    = get_string('showonentiresite', 'block');
-                $mform->addElement('select', 'bui_contexts', get_string('contexts', 'block'), $contextoptions);
-                $mform->addHelpButton('bui_contexts', 'contexts', 'block');
-            }
+        // First of all, check if we are editing blocks @ front-page or no and
+        // make some dark magic if so (MDL-30340) because each page context
+        // implies one (and only one) harcoded page-type that will be set later
+        // when processing the form data at {@link block_manager::process_url_edit()}
+
+        // There are some conditions to check related to contexts
+        $ctxconditions = $this->page->context->contextlevel == CONTEXT_COURSE &&
+                         $this->page->context->instanceid == get_site()->id;
+        // And also some pagetype conditions
+        $pageconditions = isset($bits[0]) && isset($bits[1]) && $bits[0] == 'site' && $bits[1] == 'index';
+        // So now we can be 100% sure if edition is happening at frontpage
+        $editingatfrontpage = $ctxconditions && $pageconditions;
+
+        // Let the form to know about that, can be useful later
+        $mform->addElement('hidden', 'bui_editingatfrontpage', (int)$editingatfrontpage);
+
+        // Front page, show the page-contexts element and set $pagetypelist to 'any page' (*)
+        // as unique option. Processign the form will do any change if needed
+        if ($editingatfrontpage) {
+            $contextoptions = array();
+            $contextoptions[BUI_CONTEXTS_FRONTPAGE_ONLY] = get_string('showonfrontpageonly', 'block');
+            $contextoptions[BUI_CONTEXTS_FRONTPAGE_SUBS] = get_string('showonfrontpageandsubs', 'block');
+            $contextoptions[BUI_CONTEXTS_ENTIRE_SITE]    = get_string('showonentiresite', 'block');
+            $mform->addElement('select', 'bui_contexts', get_string('contexts', 'block'), $contextoptions);
+            $mform->addHelpButton('bui_contexts', 'contexts', 'block');
+            $pagetypelist['*'] = '*'; // This is not going to be shown ever, it's an unique option
+
+        // Any other system context block, hide the page-contexts element,
+        // it's always system-wide BUI_CONTEXTS_ENTIRE_SITE
+        } else if ($parentcontext->contextlevel == CONTEXT_SYSTEM) {
+            $mform->addElement('hidden', 'bui_contexts', BUI_CONTEXTS_ENTIRE_SITE);
+
         } else if ($parentcontext->contextlevel == CONTEXT_COURSE) {
             // 0 means display on current context only, not child contexts
             // but if course managers select mod-* as pagetype patterns, block system will overwrite this option
@@ -126,12 +146,10 @@ class block_edit_form extends moodleform {
             $mform->addElement('select', 'bui_contexts', get_string('contexts', 'block'), $contextoptions);
         }
 
-        $displaypagetypewarning = false;
-        if ($this->page->pagetype == 'site-index') {   // No need for pagetype list on home page
-            $pagetypelist = array('*'=>get_string('page-x', 'pagetype'));
-        } else {
-            // Generate pagetype patterns by callbacks
+        // Generate pagetype patterns by callbacks if necessary (has not been set specifically)
+        if (empty($pagetypelist)) {
             $pagetypelist = generate_page_type_patterns($this->page->pagetype, $parentcontext, $this->page->context);
+            $displaypagetypewarning = false;
             if (!array_key_exists($this->block->instance->pagetypepattern, $pagetypelist)) {
                 // Pushing block's existing page type pattern
                 $pagetypestringname = 'page-'.str_replace('*', 'x', $this->block->instance->pagetypepattern);
@@ -156,6 +174,25 @@ class block_edit_form extends moodleform {
         } else {
             $value = array_pop(array_keys($pagetypelist));
             $mform->addElement('hidden', 'bui_pagetypepattern', $value);
+            // Now we are really hiding a lot (both page-contexts and page-type-patterns),
+            // specially in some systemcontext pages having only one option (my/user...)
+            // so, until it's decided if we are going to add the 'bring-back' pattern to
+            // all those pages or no (see MDL-30574), we are going to show the unique
+            // element statically
+            // TODO: Revisit this once MDL-30574 has been decided and implemented, although
+            // perhaps it's not bad to always show this statically when only one pattern is
+            // available.
+            if (!$editingatfrontpage) {
+                // Try to beautify it
+                $strvalue = $value;
+                $strkey = 'page-'.str_replace('*', 'x', $strvalue);
+                if (get_string_manager()->string_exists($strkey, 'pagetype')) {
+                    $strvalue = get_string($strkey, 'pagetype');
+                }
+                // Show as static (hidden has been set already)
+                $mform->addElement('static', 'bui_staticpagetypepattern',
+                    get_string('restrictpagetypes','block'), $strvalue);
+            }
         }
 
         if ($this->page->subpage) {

blocks/html/db/upgrade.php

@@ -66,5 +66,8 @@ function xmldb_block_html_upgrade($oldversion) {
     // Moodle v2.1.0 release upgrade line
     // Put any upgrade step following this
 
+    // Moodle v2.2.0 release upgrade line
+    // Put any upgrade step following this
+
     return true;
 }

blocks/login/block_login.php

@@ -48,7 +48,12 @@ class block_login extends block_base {
             $this->content->text .= '<input type="text" name="username" id="login_username" value="'.s($username).'" /></div>';
 
             $this->content->text .= '<div class="c1 fld password"><label for="login_password">'.get_string('password').'</label>';
-            $this->content->text .= '<input type="password" name="password" id="login_password" value="" /></div>';
+
+            if (!empty($CFG->loginpasswordautocomplete)) {
+                $this->content->text .= '<input type="password" name="password" id="login_password" value="" autocomplete="off" /></div>';
+            } else {
+                $this->content->text .= '<input type="password" name="password" id="login_password" value="" /></div>';
+            }
 
             if (isset($CFG->rememberusername) and $CFG->rememberusername == 2) {
                 $checked = $username ? 'checked="checked"' : '';

blocks/navigation/db/upgrade.php

@@ -75,5 +75,8 @@ function xmldb_block_navigation_upgrade($oldversion, $block) {
     // Moodle v2.1.0 release upgrade line
     // Put any upgrade step following this
 
+    // Moodle v2.2.0 release upgrade line
+    // Put any upgrade step following this
+
     return true;
 }

blocks/settings/db/upgrade.php

@@ -75,5 +75,8 @@ function xmldb_block_settings_upgrade($oldversion, $block) {
     // Moodle v2.1.0 release upgrade line
     // Put any upgrade step following this
 
+    // Moodle v2.2.0 release upgrade line
+    // Put any upgrade step following this
+
     return true;
 }

course/format/scorm/version.php

@@ -0,0 +1,30 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Version details
+ *
+ * @package    format
+ * @subpackage scorm
+ * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$plugin->version   = 2011120100;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2011120100;        // Requires this Moodle version
+$plugin->component = 'format_scorm';    // Full name of the plugin (used for diagnostics)

course/format/social/version.php

@@ -0,0 +1,30 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Version details
+ *
+ * @package    format
+ * @subpackage social
+ * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$plugin->version   = 2011120100;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2011120100;        // Requires this Moodle version
+$plugin->component = 'format_social';   // Full name of the plugin (used for diagnostics)

course/format/topics/version.php

@@ -0,0 +1,30 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Version details
+ *
+ * @package    format
+ * @subpackage topics
+ * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$plugin->version   = 2011120100;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2011120100;        // Requires this Moodle version
+$plugin->component = 'format_topics';    // Full name of the plugin (used for diagnostics)

course/format/weeks/version.php

@@ -0,0 +1,30 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Version details
+ *
+ * @package    format
+ * @subpackage weeks
+ * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$plugin->version   = 2011120100;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2011120100;        // Requires this Moodle version
+$plugin->component = 'format_weeks';    // Full name of the plugin (used for diagnostics)

enrol/authorize/db/upgrade.php

@@ -96,5 +96,8 @@ function xmldb_enrol_authorize_upgrade($oldversion) {
     // Moodle v2.1.0 release upgrade line
     // Put any upgrade step following this
 
+    // Moodle v2.2.0 release upgrade line
+    // Put any upgrade step following this
+
     return true;
 }

enrol/database/db/upgrade.php

@@ -39,5 +39,8 @@ function xmldb_enrol_database_upgrade($oldversion) {
     }
 
 
+    // Moodle v2.2.0 release upgrade line
+    // Put any upgrade step following this
+
     return true;
 }

enrol/database/lib.php

@@ -185,7 +185,7 @@ class enrol_database_plugin extends enrol_plugin {
 
             $existing = array();
             foreach ($current as $r) {
-                if (in_array($r->id, $roles)) {
+                if (in_array($r->roleid, $roles)) {
                     $existing[$r->roleid] = $r->roleid;
                 } else {
                     role_unassign($r->roleid, $user->id, $context->id, 'enrol_database', $instance->id);

enrol/flatfile/db/upgrade.php

@@ -62,6 +62,8 @@ function xmldb_enrol_flatfile_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2010091400, 'enrol', 'flatfile');
     }
 
+    // Moodle v2.2.0 release upgrade line
+    // Put any upgrade step following this
 
     return $result;
 }

enrol/guest/db/upgrade.php

@@ -0,0 +1,46 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * This file keeps track of upgrades to the guest enrolment plugin
+ *
+ * @package    enrol
+ * @subpackage guest
+ * @copyright  2011 Petr Skoda {@link http://skodak.org
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+function xmldb_enrol_guest_upgrade($oldversion) {
+    global $CFG, $DB, $OUTPUT;
+
+    $dbman = $DB->get_manager();
+
+    // Moodle v2.2.0 release upgrade line
+    // Put any upgrade step following this
+
+    if ($oldversion < 2011112901) {
+        // convert all null passwords to empty strings
+        $DB->set_field('enrol', 'password', '', array('enrol'=>'guest', 'password'=>null));
+
+        upgrade_plugin_savepoint(true, 2011112901, 'enrol', 'guest');
+    }
+
+    return true;
+}
+
+

enrol/guest/lib.php

@@ -327,6 +327,22 @@ class enrol_guest_plugin extends enrol_plugin {
         }
     }
 
+    /**
+     * Add new instance of enrol plugin.
+     * @param object $course
+     * @param array instance fields
+     * @return int id of new instance, null if can not be created
+     */
+    public function add_instance($course, array $fields = NULL) {
+        $fields = (array)$fields;
+
+        if (!isset($fields['password'])) {
+            $fields['password'] = '';
+        }
+
+        return parent::add_instance($course, $fields);
+    }
+
     /**
      * Add new instance of enrol plugin with default settings.
      * @param object $course

enrol/guest/version.php

@@ -25,6 +25,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2011112900;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->version   = 2011112901;        // The current plugin version (Date: YYYYMMDDXX)
 $plugin->requires  = 2011112900;        // Requires this Moodle version
 $plugin->component = 'enrol_guest';     // Full name of the plugin (used for diagnostics)

enrol/imsenterprise/db/upgrade.php

@@ -83,6 +83,9 @@ function xmldb_enrol_imsenterprise_upgrade($oldversion) {
     // Moodle v2.1.0 release upgrade line
     // Put any upgrade step following this
 
+    // Moodle v2.2.0 release upgrade line
+    // Put any upgrade step following this
+
     return true;
 }
 

enrol/imsenterprise/lib.php

@@ -403,6 +403,10 @@ function process_group_tag($tagcontents) {
 
                     $courseid = $DB->insert_record('course', $course);
 
+                    // Setup default enrolment plugins
+                    $course->id = $courseid;
+                    enrol_course_updated(true, $course, null);
+
                     // Setup the blocks
                     $course = $DB->get_record('course', array('id' => $courseid));
                     blocks_add_default_course_blocks($course);

enrol/mnet/db/upgrade.php

@@ -39,5 +39,8 @@ function xmldb_enrol_mnet_upgrade($oldversion) {
     // Moodle v2.1.0 release upgrade line
     // Put any upgrade step following this
 
+    // Moodle v2.2.0 release upgrade line
+    // Put any upgrade step following this
+
     return true;
 }

enrol/paypal/db/upgrade.php

@@ -62,5 +62,8 @@ function xmldb_enrol_paypal_upgrade($oldversion) {
     // Moodle v2.1.0 release upgrade line
     // Put any upgrade step following this
 
+    // Moodle v2.2.0 release upgrade line
+    // Put any upgrade step following this
+
     return true;
 }

filter/mediaplugin/db/upgrade.php

@@ -46,5 +46,8 @@ function xmldb_filter_mediaplugin_upgrade($oldversion) {
     // Moodle v2.1.0 release upgrade line
     // Put any upgrade step following this
 
+    // Moodle v2.2.0 release upgrade line
+    // Put any upgrade step following this
+
     return true;
 }

filter/tex/db/upgrade.php

@@ -41,5 +41,8 @@ function xmldb_filter_tex_upgrade($oldversion) {
     // Moodle v2.1.0 release upgrade line
     // Put any upgrade step following this
 
+    // Moodle v2.2.0 release upgrade line
+    // Put any upgrade step following this
+
     return true;
 }

grade/grading/form/rubric/db/upgrade.php

@@ -35,5 +35,8 @@ function xmldb_gradingform_rubric_upgrade($oldversion) {
 
     $dbman = $DB->get_manager();
 
+    // Moodle v2.2.0 release upgrade line
+    // Put any upgrade step following this
+
     return true;
 }

grade/report/user/index.php

@@ -103,7 +103,7 @@ if (has_capability('moodle/grade:viewall', $context)) { //Teachers will see all
 
         if ($user_selector) {
             $renderer = $PAGE->get_renderer('gradereport_user');
-            echo $renderer->graded_users_selector('user', $course, $userid, $currentgroup, false);
+            echo $renderer->graded_users_selector('user', $course, $userid, $currentgroup, true);
         }
 
         while ($userdata = $gui->next_user()) {

index.php

@@ -58,7 +58,7 @@
         // Redirect logged-in users to My Moodle overview if required
         if (optional_param('setdefaulthome', false, PARAM_BOOL)) {
             set_user_preference('user_home_page_preference', HOMEPAGE_SITE);
-        } else if ($CFG->defaulthomepage == HOMEPAGE_MY && (optional_param('redirect', true, PARAM_BOOL) || !$hassiteconfig)) {
+        } else if ($CFG->defaulthomepage == HOMEPAGE_MY && optional_param('redirect', 1, PARAM_BOOL) === 1) {
             redirect($CFG->wwwroot .'/my/');
         } else if (!empty($CFG->defaulthomepage) && $CFG->defaulthomepage == HOMEPAGE_USER) {
             $PAGE->settingsnav->get('usercurrentsettings')->add(get_string('makethismyhome'), new moodle_url('/', array('setdefaulthome'=>true)), navigation_node::TYPE_SETTING);

install/lang/af/admin.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/af/langconfig.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/am/install.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/am/langconfig.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/am/moodle.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/ar/admin.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/ar/error.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/ar/install.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/ar/langconfig.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/ar/moodle.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/ast/admin.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/ast/error.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/ast/install.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/ast/langconfig.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/ast/moodle.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/az/admin.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/az/error.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/az/install.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/az/langconfig.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/be/langconfig.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/be/moodle.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/bg/admin.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/bg/error.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/bg/install.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/bg/langconfig.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/bg/moodle.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/bn/admin.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/bn/install.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/bn/langconfig.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/bn/moodle.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/bs/install.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/bs/langconfig.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/ca/admin.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/ca/error.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/ca/install.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/ca/langconfig.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/ca/moodle.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/ckb/langconfig.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/cs/admin.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/cs/error.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/cs/install.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was
@@ -34,12 +34,14 @@ $string['admindirname'] = 'Adresář se soubory pro správu serveru';
 $string['availablelangs'] = 'Dostupné jazykové balíčky';
 $string['chooselanguagehead'] = 'Vyberte jazyk';
 $string['chooselanguagesub'] = 'Zvolte si jazyk tohoto průvodce instalací. Vybraný jazyk bude též nastaven jako výchozí jazyk stránek, ale to půjde případně později změnit.';
+$string['clialreadyconfigured'] = 'Soubor config.php již existuje. Spusťte admin/cli/install_database.php, pokud chcete provést instalaci databáze.';
 $string['clialreadyinstalled'] = 'Soubor config.php již existuje. Spusťte admin/cli/upgrade.php, pokud chcete provést upgrade vašich stránek.';
 $string['cliinstallheader'] = 'Moodle {$a} - průvodce instalací z příkazové řádky';
 $string['databasehost'] = 'Databázový server';
 $string['databasename'] = 'Název databáze';
 $string['databasetypehead'] = 'Vyberte databázový ovladač';
 $string['dataroot'] = 'Datový adresář';
+$string['datarootpermission'] = 'Přístupová práva k datovému adresáři';
 $string['dbprefix'] = 'Předpona tabulek';
 $string['dirroot'] = 'Adresář Moodlu';
 $string['environmenthead'] = 'Kontrola programového prostředí...';

install/lang/cs/langconfig.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/cs/moodle.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/cy/admin.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/cy/error.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/cy/install.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/cy/langconfig.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/cy/moodle.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/da/admin.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/da/error.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/da/install.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was
@@ -34,7 +34,7 @@ $string['admindirname'] = 'Admin-mappe';
 $string['availablelangs'] = 'Tilgængelige sprogpakker';
 $string['chooselanguagehead'] = 'Vælg et sprog';
 $string['chooselanguagesub'] = 'Vælg et sprog til brug under installationen. Dette sprog vil også blive brugt som standardsprog på webstedet, men det kan altid ændres til et andet sprog.';
-$string['clialreadyinstalled'] = 'Filen config.php eksisterer allerede, brug venligst admin/cli/upgrade.php hvis du ønsker at opgradere dit websted.';
+$string['clialreadyinstalled'] = 'Filen config.php eksisterer allerede, brug venligst admin/cli/upgrade.php hvis du ønsker at opgradere dette websted.';
 $string['cliinstallheader'] = 'Moodle {$a} kommandolinje-installationsprogram';
 $string['databasehost'] = 'Databasevært';
 $string['databasename'] = 'Databasenavn';

install/lang/da/langconfig.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/da/moodle.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/de/admin.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/de/error.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/de/install.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/de/langconfig.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/de/moodle.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/de_du/error.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/de_du/install.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/de_du/langconfig.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/de_kids/langconfig.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/dv/admin.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/dv/error.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/dv/install.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was

install/lang/dv/langconfig.php

@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
  *
  * Do not edit this file manually! It contains just a subset of strings
  * needed during the very first steps of installation. This file was