diff --git a/browse.php b/browse.php index 197beef..2cbbea4 100755 --- a/browse.php +++ b/browse.php @@ -138,7 +138,7 @@ class BrowseDispatcher extends KTStandardDispatcher { } } - $this->aBreadcrumbs = array_merge($this->aBreadcrumbs, KTBrowseUtil::breadcrumbsForFolder($oFolder)); + $this->aBreadcrumbs = kt_array_merge($this->aBreadcrumbs, KTBrowseUtil::breadcrumbsForFolder($oFolder)); $this->oFolder =& $oFolder; diff --git a/lib/browse/Criteria.inc b/lib/browse/Criteria.inc index a20d1d2..3c98396 100644 --- a/lib/browse/Criteria.inc +++ b/lib/browse/Criteria.inc @@ -635,7 +635,7 @@ class GenericMetadataCriterion extends BrowseCriterion { function searchSQL ($aRequest) { $p = parent::searchSQL($aRequest, false); // handle not ourselves. $p[0] = join(' AND ', array($p[0], "$this->sSearchTable.document_field_id = ?")); - $p[1] = array_merge($p[1], array($this->iID)); + $p[1] = kt_array_merge($p[1], array($this->iID)); // handle the boolean "not" stuff. $want_invert = KTUtil::arrayGet($aRequest, $this->getWidgetBase() . '_not'); diff --git a/lib/users/User.inc b/lib/users/User.inc index 8bda0c9..d73fe71 100644 --- a/lib/users/User.inc +++ b/lib/users/User.inc @@ -192,7 +192,7 @@ class User extends KTEntity { if (!isset($dashlets->left)) $dashlets->left = array(); if (!isset($dashlets->right)) $dashlets->right = array(); - $mergedlist = array_merge($dashlets->left,$dashlets->right); + $mergedlist = kt_array_merge($dashlets->left,$dashlets->right); $knownlist = array(); diff --git a/lib/util/ktutil.inc b/lib/util/ktutil.inc index 6112cb3..fc5a469 100644 --- a/lib/util/ktutil.inc +++ b/lib/util/ktutil.inc @@ -143,12 +143,12 @@ class KTUtil { $aNewParams = array(); foreach ($oSomething[1] as $oParam) { if (is_array($oParam)) { - $aNewParams = array_merge($aNewParams, $oParam); + $aNewParams = kt_array_merge($aNewParams, $oParam); } else { $aNewParams[] = $oParam; } } - $aParams = array_merge($aParams, $aNewParams); + $aParams = kt_array_merge($aParams, $aNewParams); } else { return PEAR::raiseError(_kt("Weird WhereClause passed")); } @@ -429,7 +429,7 @@ class KTUtil { if (!is_array($aAddOptions)) { $aAddOptions = array(); } - return array_merge($aStartOptions, $aAddOptions); + return kt_array_merge($aStartOptions, $aAddOptions); } // }}} diff --git a/plugins/ktstandard/KTEmail.php b/plugins/ktstandard/KTEmail.php index d46fa6d..56aa5a8 100644 --- a/plugins/ktstandard/KTEmail.php +++ b/plugins/ktstandard/KTEmail.php @@ -58,7 +58,7 @@ function sendGroupEmails($aGroupIDs, $oDocument, $sComment = '', $bAttachDocumen $default->log->info('sendingEmail to group ' . $oDestGroup->getName()); // for each group, retrieve all the users foreach($aDestinationGroups as $oGroup){ - $aUsers = array_merge($aUsers, $oGroup->getUsers()); + $aUsers = kt_array_merge($aUsers, $oGroup->getUsers()); } // FIXME: this should send one email with multiple To: users @@ -370,7 +370,7 @@ class KTDocumentEmailAction extends KTDocumentAction { $aGroups = GroupUtil::listGroupsForUser($this->oUser); $aMembers = array(); foreach ($aGroups as $oGroup) { - $aMembers = array_merge($aMembers, $oGroup->getMembers()); + $aMembers = kt_array_merge($aMembers, $oGroup->getMembers()); } $aUsers = array(); $aUserIds = array(); diff --git a/plugins/rssplugin/KTrss.inc.php b/plugins/rssplugin/KTrss.inc.php index 7c66159..2a946e4 100644 --- a/plugins/rssplugin/KTrss.inc.php +++ b/plugins/rssplugin/KTrss.inc.php @@ -68,7 +68,7 @@ class KTrss{ $folders=KTrss::getFolders($iUserId); if (is_null($documents)) $documents=array(); if (is_null($folders)) $folders=array(); - $aFullList = array_merge($documents,$folders ); + $aFullList = kt_array_merge($documents,$folders ); if($aFullList){ $internalFeed = KTrss::arrayToXML($aFullList); $response = rss2arrayBlock($internalFeed); @@ -163,7 +163,7 @@ class KTrss{ if ($aFolderList) { foreach($aFolderList as $folderElement){ $folder_id = $folderElement['id']; - $aFolderTransactions = array_merge($aFolderTransactions, KTrss::getFolderTransactions($folder_id)); + $aFolderTransactions = kt_array_merge($aFolderTransactions, KTrss::getFolderTransactions($folder_id)); } } if ($aFolderTransactions){ diff --git a/view.php b/view.php index 290f0d5..4084d28 100755 --- a/view.php +++ b/view.php @@ -142,7 +142,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher { ); $this->oDocument =& $oDocument; - $this->aBreadcrumbs = array_merge($this->aBreadcrumbs, KTBrowseUtil::breadcrumbsForDocument($oDocument, $aOptions)); + $this->aBreadcrumbs = kt_array_merge($this->aBreadcrumbs, KTBrowseUtil::breadcrumbsForDocument($oDocument, $aOptions)); $this->oPage->setBreadcrumbDetails(_kt("document details")); $this->addPortlets("Document Details"); @@ -282,7 +282,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher { "folderaction" => "browse", ); - $this->aBreadcrumbs = array_merge($this->aBreadcrumbs, KTBrowseUtil::breadcrumbsForDocument($oDocument, $aOptions)); + $this->aBreadcrumbs = kt_array_merge($this->aBreadcrumbs, KTBrowseUtil::breadcrumbsForDocument($oDocument, $aOptions)); $this->oPage->setBreadcrumbDetails(_kt("compare versions")); $comparison_version = sanitizeForSQL(KTUtil::arrayGet($_REQUEST, 'fComparisonVersion'));