MDL-23068 removing obsolete $result and removing empty upgrade files …

…that would be probably never used at all + minor cleanup/fixing
deeknow · Jul 4, 2010 · a4cdd6d · a4cdd6d
1 parent 77dd303
commit a4cdd6d
Show file tree

Hide file tree

Showing 73 changed files with 842 additions and 2,166 deletions.
diff --git a/admin/xmldb/actions/XMLDBAction.class.php b/admin/xmldb/actions/XMLDBAction.class.php
@@ -239,22 +239,22 @@ function upgrade_savepoint_php($structure) {
             case 'lib': /// has own savepoint function
                 $result = XMLDB_LINEFEED .
                           '    /// Main savepoint reached' . XMLDB_LINEFEED .
-                          '        upgrade_main_savepoint($result, XXXXXXXXXX);' . XMLDB_LINEFEED;
+                          '        upgrade_main_savepoint(true, XXXXXXXXXX);' . XMLDB_LINEFEED;
                 break;
             case 'mod': /// has own savepoint function
                 $result = XMLDB_LINEFEED .
                           '    /// ' . $pluginname . ' savepoint reached' . XMLDB_LINEFEED .
-                          '        upgrade_mod_savepoint($result, XXXXXXXXXX, ' . "'$pluginname'" . ');' . XMLDB_LINEFEED;
+                          '        upgrade_mod_savepoint(true, XXXXXXXXXX, ' . "'$pluginname'" . ');' . XMLDB_LINEFEED;
                 break;
             case 'block': /// has own savepoint function
                 $result = XMLDB_LINEFEED .
                           '    /// ' . $pluginname . ' savepoint reached' . XMLDB_LINEFEED .
-                          '        upgrade_block_savepoint($result, XXXXXXXXXX, ' . "'$pluginname'" . ');' . XMLDB_LINEFEED;
+                          '        upgrade_block_savepoint(true, XXXXXXXXXX, ' . "'$pluginname'" . ');' . XMLDB_LINEFEED;
                 break;
             default: /// rest of plugins
                 $result = XMLDB_LINEFEED .
                           '    /// ' . $pluginname . ' savepoint reached' . XMLDB_LINEFEED .
-                          '        upgrade_plugin_savepoint($result, XXXXXXXXXX, ' . "'$plugintype'" . ', ' . "'$pluginname'" . ');' . XMLDB_LINEFEED;
+                          '        upgrade_plugin_savepoint(true, XXXXXXXXXX, ' . "'$plugintype'" . ', ' . "'$pluginname'" . ');' . XMLDB_LINEFEED;
         }
         return $result;
     }

diff --git a/blocks/activity_modules/db/upgrade.php b/blocks/activity_modules/db/upgrade.php
diff --git a/blocks/calendar_month/db/upgrade.php b/blocks/calendar_month/db/upgrade.php
diff --git a/blocks/calendar_upcoming/db/upgrade.php b/blocks/calendar_upcoming/db/upgrade.php
diff --git a/blocks/community/db/upgrade.php b/blocks/community/db/upgrade.php
@@ -47,9 +47,8 @@ function xmldb_block_community_upgrade($oldversion) {
     global $CFG, $DB;
 
     $dbman = $DB->get_manager();
-    $result = true;
 
-    if ($result && $oldversion < 2010042701) {
+    if ($oldversion < 2010042701) {
 
         /// Define table block_community to be created
         $table = new xmldb_table('block_community');
@@ -71,9 +70,9 @@ function xmldb_block_community_upgrade($oldversion) {
         }
 
         /// community savepoint reached
-        upgrade_block_savepoint($result, 2010042701, 'community');
+        upgrade_block_savepoint(true, 2010042701, 'community');
     }
 
 
-    return $result;
+    return true;
 }
diff --git a/blocks/course_list/db/upgrade.php b/blocks/course_list/db/upgrade.php
diff --git a/blocks/course_summary/db/upgrade.php b/blocks/course_summary/db/upgrade.php
diff --git a/blocks/news_items/db/upgrade.php b/blocks/news_items/db/upgrade.php
diff --git a/blocks/online_users/db/upgrade.php b/blocks/online_users/db/upgrade.php
diff --git a/blocks/participants/db/upgrade.php b/blocks/participants/db/upgrade.php