diff --git a/backup/moodle2/restore_stepslib.php b/backup/moodle2/restore_stepslib.php
index aff143f5194..d25e46486c2 100644
--- a/backup/moodle2/restore_stepslib.php
+++ b/backup/moodle2/restore_stepslib.php
@@ -2029,7 +2029,6 @@ class restore_badges_structure_step extends restore_structure_step {
$params = array(
'name' => $data->name,
'description' => $data->description,
- 'image' => 0,
'timecreated' => $this->apply_date_offset($data->timecreated),
'timemodified' => $this->apply_date_offset($data->timemodified),
'usercreated' => $data->usercreated,
diff --git a/badges/newbadge.php b/badges/newbadge.php
index 413e56c1369..91c316c158d 100644
--- a/badges/newbadge.php
+++ b/badges/newbadge.php
@@ -80,7 +80,6 @@ if ($form->is_cancelled()) {
$fordb->timemodified = $now;
$fordb->usercreated = $USER->id;
$fordb->usermodified = $USER->id;
- $fordb->image = 0;
$fordb->issuername = $data->issuername;
$fordb->issuerurl = $data->issuerurl;
$fordb->issuercontact = $data->issuercontact;
diff --git a/badges/tests/badgeslib_test.php b/badges/tests/badgeslib_test.php
index 37c67075e3e..b51d155e6af 100644
--- a/badges/tests/badgeslib_test.php
+++ b/badges/tests/badgeslib_test.php
@@ -46,7 +46,6 @@ class badges_testcase extends advanced_testcase {
$fordb->timemodified = time();
$fordb->usercreated = $user->id;
$fordb->usermodified = $user->id;
- $fordb->image = 0;
$fordb->issuername = "Test issuer";
$fordb->issuerurl = "http://issuer-url.domain.co.nz";
$fordb->expiredate = null;
@@ -74,7 +73,6 @@ class badges_testcase extends advanced_testcase {
$newid = $badge->make_clone();
$cloned_badge = new badge($newid);
- $this->assertEquals($badge->image, $cloned_badge->image);
$this->assertEquals($badge->description, $cloned_badge->description);
$this->assertEquals($badge->issuercontact, $cloned_badge->issuercontact);
$this->assertEquals($badge->issuername, $cloned_badge->issuername);
diff --git a/lib/badgeslib.php b/lib/badgeslib.php
index cf517646ced..8d879f7240b 100644
--- a/lib/badgeslib.php
+++ b/lib/badgeslib.php
@@ -108,7 +108,6 @@ class badge {
public $timemodified;
public $usercreated;
public $usermodified;
- public $image;
public $issuername;
public $issuerurl;
public $issuercontact;
@@ -241,7 +240,6 @@ class badge {
$fordb->name = get_string('copyof', 'badges', $this->name);
$fordb->status = BADGE_STATUS_INACTIVE;
- $fordb->image = 0;
$fordb->usercreated = $USER->id;
$fordb->usermodified = $USER->id;
$fordb->timecreated = time();
@@ -1083,10 +1081,7 @@ function badges_process_badge_image(badge $badge, $iconfile) {
require_once($CFG->libdir. '/gdlib.php');
if (!empty($CFG->gdversion)) {
- if ($fileid = (int)process_new_icon($badge->get_context(), 'badges', 'badgeimage', $badge->id, $iconfile)) {
- $badge->image = $fileid;
- $badge->save();
- }
+ process_new_icon($badge->get_context(), 'badges', 'badgeimage', $badge->id, $iconfile);
@unlink($iconfile);
// Clean up file draft area after badge image has been saved.
diff --git a/lib/db/install.xml b/lib/db/install.xml
index dba20252823..27e3b733bab 100644
--- a/lib/db/install.xml
+++ b/lib/db/install.xml
@@ -2876,7 +2876,6 @@
-
diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 4c2e9bc3acd..a580d0af711 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -2293,5 +2293,18 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2013071500.01);
}
+ if ($oldversion < 2013071500.02) {
+ // Define field attachment to be dropped from badge.
+ $table = new xmldb_table('badge');
+ $field = new xmldb_field('image');
+
+ // Conditionally launch drop field eventtype.
+ if ($dbman->field_exists($table, $field)) {
+ $dbman->drop_field($table, $field);
+ }
+
+ upgrade_main_savepoint(true, 2013071500.02);
+ }
+
return true;
}
diff --git a/version.php b/version.php
index e3a379dee50..b59bb52a033 100644
--- a/version.php
+++ b/version.php
@@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
-$version = 2013071500.01; // YYYYMMDD = weekly release date of this DEV branch
+$version = 2013071500.02; // YYYYMMDD = weekly release date of this DEV branch
// RR = release increments - 00 in DEV branches
// .XX = incremental changes