Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0

htdocs/filefunc.inc.php

@@ -92,7 +92,7 @@
         $path=$_SERVER["CONTEXT_PREFIX"];       // example '/dolibarr/' when using an apache alias.
         if (! preg_match('/\/$/', $path)) $path.='/';
     }
-    else if (preg_match('/index\.php', $_SERVER['PHP_SELF']))
+    else if (preg_match('/index\.php/', $_SERVER['PHP_SELF']))
     {
         // When we ask index.php, we MUST BE SURE that $path is '' at the end. This is required to make install process
         // when using apache alias like '/dolibarr/' that point to htdocs.
@@ -113,11 +113,11 @@
     		if (empty($TDir[$i]) || $TDir[$i] == 'htdocs') break;
             if ($TDir[$i] == 'dolibarr') break;
             if (substr($TDir[$i], -4, 4) == '.php') continue;
-    		
+
     		$path .= '../';
     	}
     }
-    
+
 	header("Location: ".$path."install/index.php");
 	exit;
 }