Bumped version and new rename field upgrading for HEAD.

diff --git a/enrol/authorize/db/upgrade.php b/enrol/authorize/db/upgrade.php
index 021f2fee140ec4961673001cdfe58c5e67a1229c..214f7262fbc6e1d7aa0b6f9fd66610782a8bb987 100644 (file)
--- a/enrol/authorize/db/upgrade.php
+++ b/enrol/authorize/db/upgrade.php
@@ -1,19 +1,38 @@
 <?php  //$Id$
 
+// This file keeps track of upgrades to
+// the authorize enrol plugin
+//
+// Sometimes, changes between versions involve
+// alterations to database structures and other
+// major things that may break installations.
+//
+// The upgrade function in this file will attempt
+// to perform all the necessary actions to upgrade
+// your older installtion to the current version.
+//
+// If there's something it cannot do itself, it
+// will tell you what you need to do.
+//
+// The commands in here will all be database-neutral,
+// using the functions defined in lib/ddllib.php
+
 function xmldb_enrol_authorize_upgrade($oldversion=0) {
 
     global $CFG, $THEME, $db;
 
-    $status = true;
+    $result = true;
 
-    if ($status && $oldversion < 2006101701) {
+    if ($result && $oldversion < 2006111700) {
         $table = new XMLDBTable('enrol_authorize');
-        $field = new XMLDBField('cclastfour');
-        $field->setAttributes(XMLDB_TYPE_INTEGER, '4', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0', 'paymentmethod');
-        $status = $status && rename_field($table, $field, 'refundinfo');
+        if (!field_exists($table, new XMLDBField('refundinfo'))) {
+            $field = new XMLDBField('cclastfour');
+            $field->setAttributes(XMLDB_TYPE_INTEGER, '4', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0', 'paymentmethod');
+            $result = $result && rename_field($table, $field, 'refundinfo');
+        }
     }
 
-    return $status;
+    return $result;
 }
 
 ?>

diff --git a/enrol/authorize/version.php b/enrol/authorize/version.php
index 256deede8c1af9935dcce4d071f82c680e274a5c..5fb02e57abd1c27baf274737c391d3c65eff10dc 100755 (executable)
--- a/enrol/authorize/version.php
+++ b/enrol/authorize/version.php
@@ -1,6 +1,6 @@
 <?php // $Id$
 
-$plugin->version  = 2006101701;
+$plugin->version  = 2006111700;
 $plugin->requires = 2006100401;
 
 ?>