Corrected file_exists check and little refactor

Dolibarr · Jul 17, 2014 · bcafa2c · bcafa2c
1 parent ad4512c
commit bcafa2c
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
@@ -240,16 +240,17 @@ function dol_getprefix()
  */
 function dol_include_once($relpath, $classname='')
 {
+	$fullpath = dol_buildpath($relpath);
 
-	if (!file_exists($relpath)) {
+	if (!file_exists($fullpath)) {
 		dol_syslog('functions::dol_include_once Tried to load unexisting file: '.$relpath, LOG_ERR);
 		return false;
 	}
 
 	if (! empty($classname) && ! class_exists($classname)) {
-		return include dol_buildpath($relpath);
+		return include $fullpath;
 	} else {
-		return include_once dol_buildpath($relpath);
+		return include_once $fullpath;
 	}
 }