Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

…nto MOODLE_25_STABLE
  • Loading branch information...
commit d8581a236794467ec4156ff73a61646ab5540530 2 parents b7bbb61 + 82198de
@damyon damyon authored
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
@@ -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;
}
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
@@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
-$version = 2013051400.00; // 20130514 = branching date YYYYMMDD - do not modify!
+$version = 2013051400.01; // 20130514 = branching date YYYYMMDD - do not modify!
// RR = release increments - 00 in DEV branches
// .XX = incremental changes
Please sign in to comment.
Something went wrong with that request. Please try again.