From 3fb53509bff3c86272a5e2e4ddf7d90016cd263f Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sat, 26 Aug 2017 10:13:44 +0200
Subject: [PATCH] - fixed issue bug template - added version cropping to
 installer

---
 .gitlab/issue_templates/Bug.md | 7 ++++++-
 install/lib/install.lib.php    | 3 +++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md
index 0f22c5dbce..751016f70a 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 3466d0b50c..4ada0421e3 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":
-- 
GitLab