From 4f1d6d732881199c111b7463e19851933f02bb69 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 15 Jun 2012 11:24:09 +0200 Subject: [PATCH] Fix: missing a return into clean_url function --- htdocs/core/lib/functions2.lib.php | 1 + htdocs/societe/soc.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php index 93fa494623c..d938d41e974 100644 --- a/htdocs/core/lib/functions2.lib.php +++ b/htdocs/core/lib/functions2.lib.php @@ -416,6 +416,7 @@ function clean_url($url,$http=1) return $CleanUrl; } + else return $url; } /** diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index b63891a5d46..1b7364fc180 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -450,14 +450,14 @@ if (empty($reshook)) } } } - + // Remove file in doc form else if ($action == 'remove_file') { if ($object->fetch($socid)) { require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); - + $langs->load("other"); $upload_dir = $conf->societe->dir_output; $file = $upload_dir . '/' . GETPOST('file');