diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md index 0f22c5dbceeb261da51cdcb008a61626dcaf1b39..751016f70ad21999ff87d79d5e8191e1e1ae5d84 100644 --- a/.gitlab/issue_templates/Bug.md +++ b/.gitlab/issue_templates/Bug.md @@ -18,7 +18,7 @@ insert the output of `nginx -v` or `apachectl -v` here insert the output of `php -v` here ``` -## propsed fix +## proposed fix optional, of course. if you want to post code snippets, please use ``` @@ -34,3 +34,8 @@ if you know of a forum post on howtoforge.com that deals with this topic, just a ## screenshots optional, of course. Add screenshots of the problem by clicking "Attach a file" on the bottom right. + +## log entries +``` +apache / nginx error.log lines (if related) +``` \ No newline at end of file diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php index 3466d0b50c3110882edaae54cda916dff6167e27..4ada0421e33a2dc40a9d1a72288e0f9110e6c28f 100644 --- a/install/lib/install.lib.php +++ b/install/lib/install.lib.php @@ -90,6 +90,9 @@ function get_distname() { $ver = explode(" ", $ver, 2); $ver = reset($ver); $mainver = $ver; + $mainver = explode('.', $ver); + $mainver = array_filter($mainver); + $mainver = current($mainver).'.'.next($mainver); } switch ($mainver){ case "17.04":