From 8c6a4706f8bf375738197ed83d1f91d8a17032ef Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Thu, 26 May 2016 02:21:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 install/install.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/install/install.php b/install/install.php
index cff2265..14c9815 100644
--- a/install/install.php
+++ b/install/install.php
@@ -133,7 +133,7 @@
 //** Include the distribution-specific installer class library and configuration
 if(is_file('dist/lib/'.$dist['baseid'].'.lib.php')) include_once 'dist/lib/'.$dist['baseid'].'.lib.php';
 include_once 'dist/lib/'.$dist['id'].'.lib.php';
-include_once 'dist/conf/'.$dist['id'].'.conf.php';
+include_once 'dist/conf/'.$dist['confid'].'.conf.php';
 
 //****************************************************************************************************
 //** Installer Interface

--
Gitblit v1.9.1