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

…nto MOODLE_24_STABLE
moodle · May 17, 2013 · a1972f5 · a1972f5
2 parents 0571a68 + 8fec03b
commit a1972f5
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/lib/db/upgrade.php b/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;
 }
diff --git a/lib/licenselib.php b/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);
 

diff --git a/version.php b/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