projects
/
pear
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
35c07c1
)
HTML/FlexyFramework/Generator.php
author
Alan Knowles
<alan@akbkhome.com>
Thu, 16 Dec 2010 07:04:57 +0000
(15:04 +0800)
committer
Alan Knowles
<alan@akbkhome.com>
Thu, 16 Dec 2010 07:04:57 +0000
(15:04 +0800)
HTML/FlexyFramework/Generator.php
patch
|
blob
|
history
diff --git
a/HTML/FlexyFramework/Generator.php
b/HTML/FlexyFramework/Generator.php
index
f409b17
..
7cc0df2
100644
(file)
--- a/
HTML/FlexyFramework/Generator.php
+++ b/
HTML/FlexyFramework/Generator.php
@@
-216,7
+216,7
@@
class HTML_FlexyFramework_Generator extends DB_DataObject_Generator
continue;
}
// prefer first ?
- $links =
array_merge_recursive
( parse_ini_file($ini, true), $links);
+ $links =
self::mergeIni
( parse_ini_file($ini, true), $links);
}
$iniLinksCache = preg_replace('/\.ini$/', '.links.ini', $iniCache);
$out = array();