Peter M. Groen / knowledgetree

Commit 1ff3b9458412ec14f7bda845809ce33abea677a5

Authored by Neil Blakey-Milner
1 parent 37889481

Be more defensive in terms of what is potentially getting passed to us. 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4269 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 6 additions and 0 deletions
lib/documentmanagement/documentutil.inc.php
  View file @1ff3b94
@@ -214,6 +214,9 @@ class KTDocumentUtil { @@ -214,6 +214,9 @@ class KTDocumentUtil {
214 $aSimpleMetadata = array(); 214 $aSimpleMetadata = array();
215 foreach ($aMetadata as $aSingleMetadatum) { 215 foreach ($aMetadata as $aSingleMetadatum) {
216 list($oField, $sValue) = $aSingleMetadatum; 216 list($oField, $sValue) = $aSingleMetadatum;
  217 + if (is_null($oField)) {
  218 + continue;
  219 + }
217 $aSimpleMetadata[$oField->getId()] = $sValue; 220 $aSimpleMetadata[$oField->getId()] = $sValue;
218 } 221 }
219 $aFailed = array(); 222 $aFailed = array();
@@ -262,6 +265,9 @@ class KTDocumentUtil { @@ -262,6 +265,9 @@ class KTDocumentUtil {
262 // XXX: Metadata refactor 265 // XXX: Metadata refactor
263 foreach ($aMetadata as $aInfo) { 266 foreach ($aMetadata as $aInfo) {
264 list($oMetadata, $sValue) = $aInfo; 267 list($oMetadata, $sValue) = $aInfo;
  268 + if (is_null($oMetadata)) {
  269 + continue;
  270 + }
265 $res = DBUtil::autoInsert($table, array( 271 $res = DBUtil::autoInsert($table, array(
266 "document_id" => $oDocument->getID(), 272 "document_id" => $oDocument->getID(),
267 "document_field_id" => $oMetadata->getID(), 273 "document_field_id" => $oMetadata->getID(),