From: defacer <defacer>
Date: Mon, 13 Dec 2004 18:32:20 +0000 (+0000)
Subject: Fixed some warnings for foreach() on empty array, when upgrading a site
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=ccb42b9a701b69d1ec4b502e8584985d2ce8bcf5;p=moodle.git

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 1c2e9be141..d237a840e6 100644
--- 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 63e5d8580c..d59700508e 100644
--- 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');