Merge branch 'MDL-55585_master' of git://github.com/dmonllao/moodle

This commit is contained in:
Dan Poltawski 2016-08-17 12:10:22 +01:00
commit e3c9de6831
2 changed files with 2 additions and 31 deletions

View File

@ -2072,7 +2072,7 @@ function xmldb_main_upgrade($oldversion) {
// Moodle v3.1.0 release upgrade line.
// Put any upgrade step following this.
if ($oldversion < 2016070700.01) {
if ($oldversion < 2016081100.01) {
// If someone is emotionally attached to it let's leave the config (basically the version) there.
if (!file_exists($CFG->dirroot . '/report/search/classes/output/form.php')) {
@ -2080,7 +2080,7 @@ function xmldb_main_upgrade($oldversion) {
}
// Savepoint reached.
upgrade_main_savepoint(true, 2016070700.01);
upgrade_main_savepoint(true, 2016081100.01);
}
return true;

View File

@ -1,29 +0,0 @@
<?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 report_search
* @copyright 2015 David Monllao {@link http://www.davidmonllao.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
defined('MOODLE_INTERNAL') || die();
$plugin->version = 2016052300; // The current plugin version (Date: YYYYMMDDXX).
$plugin->requires = 2016051900; // Requires this Moodle version.
$plugin->component = 'report_search'; // Full name of the plugin (used for diagnostics).