fixing messed up property_exists() regression - sorrrry

nuckey · Sep 17, 2010 · 4cc977a · 4cc977a
1 parent b6265b7
commit 4cc977a
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 13 deletions.
diff --git a/admin/uploaduser.php b/admin/uploaduser.php
@@ -457,7 +457,7 @@
                             }
                         }
                     }
-                    if ((property_exists($column, $existinguser) and property_exists($column, $user)) or in_array($column, $PRF_FIELDS)) {
+                    if ((property_exists($existinguser, $column) and property_exists($user, $column)) or in_array($column, $PRF_FIELDS)) {
                         if ($updatetype == 3 and $existinguser->$column !== '') {
                             //missing == non-empty only
                             continue;

diff --git a/course/modedit.php b/course/modedit.php
@@ -521,7 +521,7 @@
         foreach($outcomes as $outcome) {
             $elname = 'outcome_'.$outcome->id;
 
-            if (property_exists($elname, $fromform) and $fromform->$elname) {
+            if (property_exists($fromform, $elname) and $fromform->$elname) {
                 // so we have a request for new outcome grade item?
                 if ($items) {
                     foreach($items as $item) {

diff --git a/grade/edit/letter/index.php b/grade/edit/letter/index.php
@@ -142,7 +142,7 @@
             $gradelettername = 'gradeletter'.$i;
             $gradeboundaryname = 'gradeboundary'.$i;
 
-            if (property_exists($gradeboundaryname, $data) and $data->$gradeboundaryname != -1) {
+            if (property_exists($data, $gradeboundaryname) and $data->$gradeboundaryname != -1) {
                 $letter = trim($data->$gradelettername);
                 if ($letter == '') {
                     continue;

diff --git a/grade/edit/tree/category.php b/grade/edit/tree/category.php
@@ -155,7 +155,7 @@
 
     $convert = array('grademax', 'grademin', 'gradepass', 'multfactor', 'plusfactor', 'aggregationcoef');
     foreach ($convert as $param) {
-        if (property_exists($param, $itemdata)) {
+        if (property_exists($itemdata, $param)) {
             $itemdata->$param = unformat_float($itemdata->$param);
         }
     }
@@ -184,7 +184,7 @@
     }
 
     // Handle null decimals value - must be done before update!
-    if (!property_exists('decimals', $itemdata) or $itemdata->decimals < 0) {
+    if (!property_exists($itemdata, 'decimals') or $itemdata->decimals < 0) {
         $grade_item->decimals = null;
     }
 

diff --git a/grade/edit/tree/grade.php b/grade/edit/tree/grade.php
@@ -186,7 +186,7 @@
     }
 
     // the overriding of feedback is tricky - we have to care about external items only
-    if (!property_exists('feedback', $data) or $data->feedback == $data->oldfeedback) {
+    if (!property_exists($data, 'feedback') or $data->feedback == $data->oldfeedback) {
         $data->feedback       = $old_grade_grade->feedback;
         $data->feedbackformat = $old_grade_grade->feedbackformat;
     }

diff --git a/grade/edit/tree/item.php b/grade/edit/tree/item.php
@@ -125,7 +125,7 @@
 
     $convert = array('grademax', 'grademin', 'gradepass', 'multfactor', 'plusfactor', 'aggregationcoef');
     foreach ($convert as $param) {
-        if (property_exists($param, $data)) {
+        if (property_exists($data, $param)) {
             $data->$param = unformat_float($data->$param);
         }
     }
@@ -135,7 +135,7 @@
     $grade_item->outcomeid = null;
 
     // Handle null decimals value
-    if (!property_exists('decimals', $data) or $data->decimals < 0) {
+    if (!property_exists($data, 'decimals') or $data->decimals < 0) {
         $grade_item->decimals = null;
     }
 

diff --git a/grade/edit/tree/outcomeitem.php b/grade/edit/tree/outcomeitem.php
@@ -107,7 +107,7 @@
         $data->aggregationcoef = 0;
     }
 
-    if (property_exists('calculation', $data)) {
+    if (property_exists($data, 'calculation')) {
         $data->calculation = grade_item::normalize_formula($data->calculation, $course->id);
     }
 
@@ -123,7 +123,7 @@
 
     $convert = array('gradepass', 'aggregationcoef');
     foreach ($convert as $param) {
-        if (property_exists($param, $data)) {
+        if (property_exists($data, $param)) {
             $data->$param = unformat_float($data->$param);
         }
     }

diff --git a/grade/lib.php b/grade/lib.php
@@ -691,7 +691,7 @@ public function grade_plugin_return($params = null) {
 
         } else {
             foreach ($params as $key=>$value) {
-                if (property_exists($key, $this)) {
+                if (property_exists($this, $key)) {
                     $this->$key = $value;
                 }
             }

diff --git a/lib/completion/data_object.php b/lib/completion/data_object.php
@@ -86,7 +86,7 @@ public function __construct($params=NULL, $fetch=true) {
     public function load_optional_fields() {
         global $DB;
         foreach ($this->optional_fields as $field=>$default) {
-            if (property_exists($field, $this)) {
+            if (property_exists($this, $field)) {
                 continue;
             }
             if (empty($this->id)) {

diff --git a/mod/workshop/locallib.php b/mod/workshop/locallib.php
@@ -170,7 +170,7 @@ class workshop {
      */
     public function __construct(stdclass $dbrecord, stdclass $cm, stdclass $course, stdclass $context=null) {
         foreach ($dbrecord as $field => $value) {
-            if (property_exists('workshop', $field)) {
+            if (property_exists($field, 'workshop')) {
                 $this->{$field} = $value;
             }
         }