Message ID | 20180512102818.20600-1-lfleischer@archlinux.org |
---|---|
State | Accepted, archived |
Headers | show
Return-Path: <aur-dev-bounces@archlinux.org> Delivered-To: patchwork@archlinux.org Received: from apollo.archlinux.org (localhost [127.0.0.1]) by apollo.archlinux.org (Postfix) with ESMTP id 1817C40078A4 for <patchwork@archlinux.org>; Sat, 12 May 2018 10:28:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on apollo X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=DKIM_SIGNED=0.1, DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,MAILING_LIST_MULTI=-1, RCVD_IN_DNSWL_MED=-2.3 autolearn=ham autolearn_force=no version=3.4.1 X-Spam-BL-Results: <dns:187.90.89.91.zen.spamhaus.org> [127.0.0.11, 127.0.0.4] <dns:1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.7.8.0.6.0.6.1.0.8.f.4.0.1.0.a.2.list.dnswl.org> [127.0.9.2] Received: from orion.archlinux.org (orion.archlinux.org [IPv6:2a01:4f8:160:6087::1]) by apollo.archlinux.org (Postfix) with ESMTPS for <patchwork@archlinux.org>; Sat, 12 May 2018 10:28:45 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 47E16A4C1CBCF; Sat, 12 May 2018 10:28:39 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [IPv6:2a01:4f8:160:3033::2]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by orion.archlinux.org (Postfix) with ESMTPS; Sat, 12 May 2018 10:28:39 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 2678F2E7E0; Sat, 12 May 2018 10:28:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1526120915; bh=1W4B+pSQABC4OZmgV0DZV+XfLsiD/mYk7aMbZ+cocIc=; h=From:To:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe; b=rx7RYpr1xEpt17fBbKypWTVc5B7K6jmD5V/adm1YDNrtpW+Ia0LcjDpNZA8ubWyed +Pfu8VMhyXnRnZQ1eFupUtyWy0zUfPawiAZ/frcrAFCPpU/vhdKEual8PMYFwrbnrE 4yAzhNEEaa+Uh0emQLZX5kC58AEHC1WIpWRb2Gq+h4wP/iH6oGsD9w1LjPPo/5Comt DubyBX6WJD9Mn4tGU/S86bDuycbNcwg44Q8S6Hs2R+tmtGoucGULZvSxUx/qKmCpA3 ynOsHAGAFOomw34PZnBKqdbYOKI5yPGm9FsUyy87KootkASLZ1BB0vp381FTcMihNH mixNDBp8LJR8hlcU38X0+uwYVdKFsTcHDsukAML43CI2v0h7muG1iY55Lx5BxRoYNx Xg+EOyZUjusRa1JNgtqO6HADjNBFNIJ2LQxdNMz/qHZSxhtdccWaZojSu50jyNGu63 FuurCdK3Ac0qyIv+aAsl/iHBkYZxgpxaaa1YGoPtmdxSe3VvLLsTj9fXA8Z8gLZWja ruVQJ+g62Mm5/tikbDMj+PYOdKEzgRSZXfVrQrIQmSKxeYajYSZco+7x8VrRIXkpBb NBJtGq3jAq4mCsBc3d1py3WNmNw4j/d0TdDGjqJrPola5RDmbvuDhGfISitGccpBJx l5aYqjx/vi8RPlw2eltVZ2Co= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 607742F2BD for <aur-dev@lists.archlinux.org>; Sat, 12 May 2018 10:28:31 +0000 (UTC) Received: from orion.archlinux.org (orion.archlinux.org [88.198.91.70]) by luna.archlinux.org (Postfix) with ESMTPS for <aur-dev@lists.archlinux.org>; Sat, 12 May 2018 10:28:31 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 37FD4A4C1CBC1 for <aur-dev@lists.archlinux.org>; Sat, 12 May 2018 10:28:23 +0000 (UTC) Received: from localhost (HSI-KBW-091-089-090-187.hsi2.kabelbw.de [91.89.90.187]) (using TLSv1.2 with cipher DHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) (Authenticated sender: lfleischer) by orion.archlinux.org (Postfix) with ESMTPSA id 079AEA4C1CBC0 for <aur-dev@archlinux.org>; Sat, 12 May 2018 10:28:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=orion; t=1526120903; bh=1W4B+pSQABC4OZmgV0DZV+XfLsiD/mYk7aMbZ+cocIc=; h=From:To:Subject:Date; b=IHiyMiJykJUvdxQzJFaLvrk08vrn3Dbw6qlvtLY36UasvpCCMu9ZuAoJa6zu9lijl 0rxyTLmRnD/BrnkdAFjdo5CHG5T28zmJbEPhxchYIGm+8yIsiGtCVeNBO1u71n/msT oKkevDBCP9ZrJy+DLVUrf9Vvilyi2CtuqNlS+Ag+JsjxybtOfoWTXicIwh7U6D/IB8 FhJsfr1H+XUnXH3AfAAdmkdc9gzMXaDPA7X3vn3ZRZpUFoH5OBh4b4++Ej4ERZPSY3 d/8XdOa0NQGyVMiXjmnC3KnOPlgMHBU/Khj4nau+JYGqWKyNevKNZ4gEL9tjHr55vO DBndcKy3ICZnatFVksi2Z+E23BzjIkPH4NhLhFWLQ9hd0Y+mylhNYB6hQQm/D+iSKg XXeHjNC2o9UEB923Dg4R0wyPKGxpWS5GJGqRw9JjrvNS3Ld0OR32SRM8qGHveWbvzf 0cGReP3OwsShsZ61V/MU2/S8VmqMzueP5OWvhQI8W+Ek870ThUX6Q2qb2RVSvtSq/m LubV1zmHgKCjY8sPfzDn0jbrNRulAss8v1lBLNMqQsqjcVFNXswcfpGju5d6SutKLI bTu9Pvi5SpisZifGJLsEXBc7ntZcw/0R+7QoZUWRtOJqHOptPKlyGzdlXHgM2pEXal dt0IwFaxx6U7MgdmC37VwgNI= From: Lukas Fleischer <lfleischer@archlinux.org> To: aur-dev@archlinux.org Subject: [PATCH 1/2] confparser.inc.php: Add missing semicolon Date: Sat, 12 May 2018 12:28:17 +0200 Message-Id: <20180512102818.20600-1-lfleischer@archlinux.org> X-Mailer: git-send-email 2.17.0 X-BeenThere: aur-dev@archlinux.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "Arch User Repository \(AUR\) Development" <aur-dev.archlinux.org> List-Unsubscribe: <https://lists.archlinux.org/options/aur-dev>, <mailto:aur-dev-request@archlinux.org?subject=unsubscribe> List-Archive: <https://lists.archlinux.org/pipermail/aur-dev/> List-Post: <mailto:aur-dev@archlinux.org> List-Help: <mailto:aur-dev-request@archlinux.org?subject=help> List-Subscribe: <https://lists.archlinux.org/listinfo/aur-dev>, <mailto:aur-dev-request@archlinux.org?subject=subscribe> Errors-To: aur-dev-bounces@archlinux.org Sender: "aur-dev" <aur-dev-bounces@archlinux.org> |
Series |
[1/2] confparser.inc.php: Add missing semicolon
|
expand
|
diff --git a/web/lib/confparser.inc.php b/web/lib/confparser.inc.php index 29f17e8..cb51e02 100644 --- a/web/lib/confparser.inc.php +++ b/web/lib/confparser.inc.php @@ -22,7 +22,7 @@ function config_load() { } else { die("aurweb config file not found"); } - $AUR_CONFIG = array_replace_recursive($default_config, $config) + $AUR_CONFIG = array_replace_recursive($default_config, $config); } }
Fixes a regression introduced in 97c5bce (config: allow reading both the defaults file and the modified config, 2018-04-15). Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org> --- web/lib/confparser.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)