mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-28250-25' of git://github.com/danpoltawski/moodle

Browse Source 
Conflicts:
	version.php
This commit is contained in:
Damyon Wiese 2013-05-17 11:36:09 +08:00
commit 2d1ad229da
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/db/upgrade.php
View File

@ -2139,5 +2139,26 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2013042300.00);
}
if ($oldversion < 2013051400.01) {
// Fix incorrect cc-nc url. Unfortunately the license 'plugins' do
// not give a mechanism to do this.
$sql = "UPDATE {license}
SET source = :url, version = :newversion
WHERE shortname = :shortname AND version = :oldversion";
$params = array(
'url' => 'http://creativecommons.org/licenses/by-nc/3.0/',
'shortname' => 'cc-nc',
'newversion' => '2013051500',
'oldversion' => '2010033100'
);
$DB->execute($sql, $params);
// Main savepoint reached.
upgrade_main_savepoint(true, 2013051400.01);
}
return true;
}

4
lib/licenselib.php
View File

@ -192,9 +192,9 @@ class license_manager {
$license->shortname = 'cc-nc';
$license->fullname = 'Creative Commons - No Commercial';
$license->source = 'http://creativecommons.org/licenses/by-nd/3.0/';
$license->source = 'http://creativecommons.org/licenses/by-nc/3.0/';
$license->enabled = 1;
$license->version = '2010033100';
$license->version = '2013051500';
$active_licenses[] = $license->shortname;
self::add($license);

2
version.php
View File

@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2013051400.00; // YYYYMMDD = weekly release date of this DEV branch
$version = 2013051700.00; // YYYYMMDD = weekly release date of this DEV branch
// RR = release increments - 00 in DEV branches
// .XX = incremental changes