From 34453d32958cc71cf08e932368952f98b46b7020 Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Sat, 19 Apr 2014 10:32:43 +0200 Subject: Handle pkgbase array overrides gracefully Instead of overwriting arrays, such as depends, from the pkgbase section, new entries should be appended. Replace array_merge() with a mixture of array_merge_recursive() and array_replace_recursive() that merges array fields and replaces non-array fields. Signed-off-by: Lukas Fleischer --- web/html/pkgsubmit.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'web/html') diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index 045b8f93..11206e1f 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -147,7 +147,7 @@ if ($uid): if (isset($section_info['pkgbase'])) { $pkgbase_info = $section_info; } elseif (isset($section_info['pkgname'])) { - $pkginfo[] = array_merge($pkgbase_info, $section_info); + $pkginfo[] = array_pkgbuild_merge($pkgbase_info, $section_info); } } $section_info = array( @@ -180,7 +180,7 @@ if ($uid): if (isset($section_info['pkgbase'])) { $pkgbase_info = $section_info; } elseif (isset($section_info['pkgname'])) { - $pkginfo[] = array_merge($pkgbase_info, $section_info); + $pkginfo[] = array_pkgbuild_merge($pkgbase_info, $section_info); } } else { /* Use data from the PKGBUILD parser (deprecated!) */ -- cgit v1.2.3-24-g4f1b