Merge branch 'filled-entities-only' of https://github.com/oakey-b1/horde

horde · Aug 8, 2016 · f149457 · f149457
2 parents 0eec7fa + 16821cf
commit f149457
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/framework/Rdo/lib/Horde/Rdo/Mapper.php b/framework/Rdo/lib/Horde/Rdo/Mapper.php
@@ -253,7 +253,9 @@ public function mapFields($object, $fields = array())
                     }
                 }
 
-                if (isset($relationships[$m->table])) {
+                // don't only check the table, if there was a match
+                // for LEFT JOINs there may be a "empty" result
+                if (isset($relationships[$m->table], $relationships[$m->table][$m->primaryKey])) {
                     $object->$relationship = $m->map($relationships[$m->table]);
                 }
             }