Permalink
Browse files

Merge branch 'MDL-28250-24' of git://github.com/danpoltawski/moodle i…

…nto MOODLE_24_STABLE
  • Loading branch information...
2 parents 0571a68 + 8fec03b commit a1972f5717adc0b0c129d5a401b7983fddf88d9c @damyon damyon committed May 17, 2013
Showing with 24 additions and 3 deletions.
  1. +21 −0 lib/db/upgrade.php
  2. +2 −2 lib/licenselib.php
  3. +1 −1 version.php
View
21 lib/db/upgrade.php
@@ -1719,5 +1719,26 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2012120303.09);
}
+ if ($oldversion < 2012120304.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, 2012120304.01);
+ }
+
return true;
}
View
4 lib/licenselib.php
@@ -192,9 +192,9 @@ static public function install_licenses() {
$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);
View
2 version.php
@@ -30,7 +30,7 @@
defined('MOODLE_INTERNAL') || die();
-$version = 2012120304.00; // 20121203 = branching date YYYYMMDD - do not modify!
+$version = 2012120304.01; // 20121203 = branching date YYYYMMDD - do not modify!
// RR = release increments - 00 in DEV branches
// .XX = incremental changes

0 comments on commit a1972f5

Please sign in to comment.