Fixed some warnings for foreach() on empty array, when upgrading a site

with no workshops in it.

diff --git a/mod/workshop/db/mysql.php b/mod/workshop/db/mysql.php
index 1c2e9be141931f943edb868d31f0bc3563dc8c2c..d237a840e60bf32cd876986d64f4a205c32313d6 100644 (file)
--- a/mod/workshop/db/mysql.php
+++ b/mod/workshop/db/mysql.php
@@ -184,13 +184,15 @@ function workshop_upgrade($oldversion) {
         table_column('workshop', '', 'assessmentend', 'INTEGER', '10', 'UNSIGNED', '0', 'NOT NULL', 'submissionend');
         
         $workshops = get_records('workshop');
-        foreach ($workshops as $workshop) {
-            $early = (time() < $workshop->submissionend) ? 0 : $workshop->submissionend;
-            $late = (time() > $workshop->submissionend) ? 0 : $workshop->submissionend;
-            set_field('workshop', 'submissionstart', ($workshop->phase > 1) ? $early : $late, 'id', $workshop->id);
-            set_field('workshop', 'assessmentstart', ($workshop->phase > 2) ? $early : $late, 'id', $workshop->id);
-            set_field('workshop', 'submissionend', ($workshop->phase > 3) ? $early : $late, 'id', $workshop->id);
-            set_field('workshop', 'assessmentend', ($workshop->phase > 4) ? $early : $late, 'id', $workshop->id);
+        if(!empty($workshops)) {
+            foreach ($workshops as $workshop) {
+                $early = (time() < $workshop->submissionend) ? 0 : $workshop->submissionend;
+                $late = (time() > $workshop->submissionend) ? 0 : $workshop->submissionend;
+                set_field('workshop', 'submissionstart', ($workshop->phase > 1) ? $early : $late, 'id', $workshop->id);
+                set_field('workshop', 'assessmentstart', ($workshop->phase > 2) ? $early : $late, 'id', $workshop->id);
+                set_field('workshop', 'submissionend', ($workshop->phase > 3) ? $early : $late, 'id', $workshop->id);
+                set_field('workshop', 'assessmentend', ($workshop->phase > 4) ? $early : $late, 'id', $workshop->id);
+            }
         }
         execute_sql('ALTER TABLE  '. $CFG->prefix .'workshop DROP COLUMN phase');
         

diff --git a/mod/workshop/db/postgres7.php b/mod/workshop/db/postgres7.php
index 63e5d8580cd72b7dc1573678f905ab38e13cf004..d59700508ee611633837a244191b8053ef4a5f84 100644 (file)
--- a/mod/workshop/db/postgres7.php
+++ b/mod/workshop/db/postgres7.php
@@ -177,13 +177,15 @@ function workshop_upgrade($oldversion) {
         table_column('workshop', '', 'assessmentend', 'INTEGER', '10', 'UNSIGNED', '0', 'NOT NULL', 'submissionend');
         
         $workshops = get_records('workshop');
-        foreach ($workshops as $workshop) {
-            $early = (time() < $workshop->submissionend) ? 0 : $workshop->submissionend;
-            $late = (time() > $workshop->submissionend) ? 0 : $workshop->submissionend;
-            set_field('workshop', 'submissionstart', ($workshop->phase > 1) ? $early : $late, 'id', $workshop->id);
-            set_field('workshop', 'assessmentstart', ($workshop->phase > 2) ? $early : $late, 'id', $workshop->id);
-            set_field('workshop', 'submissionend', ($workshop->phase > 3) ? $early : $late, 'id', $workshop->id);
-            set_field('workshop', 'assessmentend', ($workshop->phase > 4) ? $early : $late, 'id', $workshop->id);
+        if(!empty($workshops)) {
+            foreach ($workshops as $workshop) {
+                $early = (time() < $workshop->submissionend) ? 0 : $workshop->submissionend;
+                $late = (time() > $workshop->submissionend) ? 0 : $workshop->submissionend;
+                set_field('workshop', 'submissionstart', ($workshop->phase > 1) ? $early : $late, 'id', $workshop->id);
+                set_field('workshop', 'assessmentstart', ($workshop->phase > 2) ? $early : $late, 'id', $workshop->id);
+                set_field('workshop', 'submissionend', ($workshop->phase > 3) ? $early : $late, 'id', $workshop->id);
+                set_field('workshop', 'assessmentend', ($workshop->phase > 4) ? $early : $late, 'id', $workshop->id);
+            }
         }
         execute_sql('ALTER TABLE  '. $CFG->prefix .'workshop DROP COLUMN phase');