[Fmsystem-commits] [14431] avoid duplicates

[Sigurd Nes]

Revision: 14431
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14431
Author:   sigurdne
Date:     2015-11-20 08:20:45 +0000 (Fri, 20 Nov 2015)
Log Message:
-----------
avoid duplicates

Modified Paths:
--------------
    branches/dev-syncromind/phpgwapi/inc/class.css.inc.php
    branches/dev-syncromind/phpgwapi/inc/class.js.inc.php

Modified: branches/dev-syncromind/phpgwapi/inc/class.css.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.css.inc.php      2015-11-19 
23:08:26 UTC (rev 14430)
+++ branches/dev-syncromind/phpgwapi/inc/class.css.inc.php      2015-11-20 
08:20:45 UTC (rev 14431)
@@ -117,7 +117,7 @@
 
                        if ( !empty($this->external_files) && 
is_array($this->external_files) )
                        {
-                               foreach($this->external_files as $file)
+                               foreach($this->external_files as $file => 
$dummy)
                                {                                       
                                        if($combine)
                                        {
@@ -179,7 +179,7 @@
                {
                        if ( is_file(PHPGW_SERVER_ROOT . "/$file") )
                        {
-                               $this->external_files[] = $file;
+                               $this->external_files[$file] = true;
                        }
                }
        }

Modified: branches/dev-syncromind/phpgwapi/inc/class.js.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.js.inc.php       2015-11-19 
23:08:26 UTC (rev 14430)
+++ branches/dev-syncromind/phpgwapi/inc/class.js.inc.php       2015-11-20 
08:20:45 UTC (rev 14431)
@@ -178,7 +178,7 @@
 
                        if ( !empty($this->external_files) && 
is_array($this->external_files) )
                        {
-                               foreach($this->external_files as $file)
+                               foreach($this->external_files as $file => 
$dummy)
                                {                                       
                                        if($combine)
                                        {
@@ -322,7 +322,7 @@
                {
                        if ( is_file(PHPGW_SERVER_ROOT . "/$file") )
                        {
-                               $this->external_files[] = $file;
+                               $this->external_files[$file] = true;
                        }
                }
        }