Peter M. Groen / knowledgetree

Commit 3ddfb69e51a542718839835809805c9ca05f0e08

Authored by Kevin Fourie
1 parent 12b07ef0

KTS-2330 

"Change array_merge to kt_array_merge for PHP5"
Updated.

Committed By: Kevin Fourie
Reviewed By: Conrad Vermeulen



git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@7125 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 7 changed files with 12 additions and 12 deletions
browse.php
  View file @3ddfb69
... ... @@ -138,7 +138,7 @@ class BrowseDispatcher extends KTStandardDispatcher {
138 138 }
139 139 }
140 140  
141   - $this->aBreadcrumbs = array_merge($this->aBreadcrumbs, KTBrowseUtil::breadcrumbsForFolder($oFolder));
  141 + $this->aBreadcrumbs = kt_array_merge($this->aBreadcrumbs, KTBrowseUtil::breadcrumbsForFolder($oFolder));
142 142 $this->oFolder =& $oFolder;
143 143  
144 144  
... ...
lib/browse/Criteria.inc
  View file @3ddfb69
... ... @@ -635,7 +635,7 @@ class GenericMetadataCriterion extends BrowseCriterion {
635 635 function searchSQL ($aRequest) {
636 636 $p = parent::searchSQL($aRequest, false); // handle not ourselves.
637 637 $p[0] = join(' AND ', array($p[0], "$this->sSearchTable.document_field_id = ?"));
638   - $p[1] = array_merge($p[1], array($this->iID));
  638 + $p[1] = kt_array_merge($p[1], array($this->iID));
639 639  
640 640 // handle the boolean "not" stuff.
641 641 $want_invert = KTUtil::arrayGet($aRequest, $this->getWidgetBase() . '_not');
... ...
lib/users/User.inc
  View file @3ddfb69
... ... @@ -192,7 +192,7 @@ class User extends KTEntity {
192 192  
193 193 if (!isset($dashlets->left)) $dashlets->left = array();
194 194 if (!isset($dashlets->right)) $dashlets->right = array();
195   - $mergedlist = array_merge($dashlets->left,$dashlets->right);
  195 + $mergedlist = kt_array_merge($dashlets->left,$dashlets->right);
196 196  
197 197  
198 198 $knownlist = array();
... ...
lib/util/ktutil.inc
  View file @3ddfb69
... ... @@ -143,12 +143,12 @@ class KTUtil {
143 143 $aNewParams = array();
144 144 foreach ($oSomething[1] as $oParam) {
145 145 if (is_array($oParam)) {
146   - $aNewParams = array_merge($aNewParams, $oParam);
  146 + $aNewParams = kt_array_merge($aNewParams, $oParam);
147 147 } else {
148 148 $aNewParams[] = $oParam;
149 149 }
150 150 }
151   - $aParams = array_merge($aParams, $aNewParams);
  151 + $aParams = kt_array_merge($aParams, $aNewParams);
152 152 } else {
153 153 return PEAR::raiseError(_kt("Weird WhereClause passed"));
154 154 }
... ... @@ -429,7 +429,7 @@ class KTUtil {
429 429 if (!is_array($aAddOptions)) {
430 430 $aAddOptions = array();
431 431 }
432   - return array_merge($aStartOptions, $aAddOptions);
  432 + return kt_array_merge($aStartOptions, $aAddOptions);
433 433 }
434 434 // }}}
435 435  
... ...
plugins/ktstandard/KTEmail.php
  View file @3ddfb69
... ... @@ -58,7 +58,7 @@ function sendGroupEmails($aGroupIDs, $oDocument, $sComment = '', $bAttachDocumen
58 58 $default->log->info('sendingEmail to group ' . $oDestGroup->getName());
59 59 // for each group, retrieve all the users
60 60 foreach($aDestinationGroups as $oGroup){
61   - $aUsers = array_merge($aUsers, $oGroup->getUsers());
  61 + $aUsers = kt_array_merge($aUsers, $oGroup->getUsers());
62 62 }
63 63  
64 64 // FIXME: this should send one email with multiple To: users
... ... @@ -370,7 +370,7 @@ class KTDocumentEmailAction extends KTDocumentAction {
370 370 $aGroups = GroupUtil::listGroupsForUser($this->oUser);
371 371 $aMembers = array();
372 372 foreach ($aGroups as $oGroup) {
373   - $aMembers = array_merge($aMembers, $oGroup->getMembers());
  373 + $aMembers = kt_array_merge($aMembers, $oGroup->getMembers());
374 374 }
375 375 $aUsers = array();
376 376 $aUserIds = array();
... ...
plugins/rssplugin/KTrss.inc.php
  View file @3ddfb69
... ... @@ -68,7 +68,7 @@ class KTrss{
68 68 $folders=KTrss::getFolders($iUserId);
69 69 if (is_null($documents)) $documents=array();
70 70 if (is_null($folders)) $folders=array();
71   - $aFullList = array_merge($documents,$folders );
  71 + $aFullList = kt_array_merge($documents,$folders );
72 72 if($aFullList){
73 73 $internalFeed = KTrss::arrayToXML($aFullList);
74 74 $response = rss2arrayBlock($internalFeed);
... ... @@ -163,7 +163,7 @@ class KTrss{
163 163 if ($aFolderList) {
164 164 foreach($aFolderList as $folderElement){
165 165 $folder_id = $folderElement['id'];
166   - $aFolderTransactions = array_merge($aFolderTransactions, KTrss::getFolderTransactions($folder_id));
  166 + $aFolderTransactions = kt_array_merge($aFolderTransactions, KTrss::getFolderTransactions($folder_id));
167 167 }
168 168 }
169 169 if ($aFolderTransactions){
... ...
view.php
  View file @3ddfb69
... ... @@ -142,7 +142,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
142 142 );
143 143  
144 144 $this->oDocument =& $oDocument;
145   - $this->aBreadcrumbs = array_merge($this->aBreadcrumbs, KTBrowseUtil::breadcrumbsForDocument($oDocument, $aOptions));
  145 + $this->aBreadcrumbs = kt_array_merge($this->aBreadcrumbs, KTBrowseUtil::breadcrumbsForDocument($oDocument, $aOptions));
146 146 $this->oPage->setBreadcrumbDetails(_kt("document details"));
147 147 $this->addPortlets("Document Details");
148 148  
... ... @@ -282,7 +282,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
282 282 "folderaction" => "browse",
283 283 );
284 284  
285   - $this->aBreadcrumbs = array_merge($this->aBreadcrumbs, KTBrowseUtil::breadcrumbsForDocument($oDocument, $aOptions));
  285 + $this->aBreadcrumbs = kt_array_merge($this->aBreadcrumbs, KTBrowseUtil::breadcrumbsForDocument($oDocument, $aOptions));
286 286 $this->oPage->setBreadcrumbDetails(_kt("compare versions"));
287 287  
288 288 $comparison_version = sanitizeForSQL(KTUtil::arrayGet($_REQUEST, 'fComparisonVersion'));
... ...