[Noalyss-commit] [noalyss] 24/27: Fix Inappropriate merge

[Dany De Bontridder]

sparkyx pushed a commit to annotated tag E-8000
in repository noalyss.

commit 474b5425abab03a05e4830f71195863679d2f396
Author: Dany De Bontridder <danydb@noalyss.eu>
AuthorDate: Sun Feb 3 16:34:09 2019 +0100

    Fix Inappropriate merge
---
 include/class/fiche.class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/class/fiche.class.php b/include/class/fiche.class.php
index c7952d3..c3c34ae 100644
--- a/include/class/fiche.class.php
+++ b/include/class/fiche.class.php
@@ -806,7 +806,7 @@ class Fiche
                 // account
                 if ($id==ATTR_DEF_ACCOUNT)
                 {
-                    $v=mb_strtoupper(mb_substr(sql_string($value), 0, 40));
+                    $v=mb_strtoupper(mb_substr($value, 0, 40));
                     try
                     {
                         // Check that the accounting can be used directly
@@ -955,7 +955,7 @@ class Fiche
                 // account
                 if ($id==ATTR_DEF_ACCOUNT)
                 {
-                    $v=mb_strtoupper(sql_string($value));
+                    $v=mb_strtoupper(mb_substr($value,0,40));                  
  
                     if (trim($v)!='')
                     {
                         if (strpos($v, ',')!=0)
@@ -1993,10 +1993,10 @@ class Fiche
         // Remove from attr_value
         $Res=$this->cn->exec_sql("delete from fiche_detail
                                  where
-                                   f_id=".$this->id);
+                                   f_id=$1",[$this->id]);
 
         // Remove from fiche
-        $Res=$this->cn->exec_sql("delete from fiche where f_id=".$this->id);
+        $Res=$this->cn->exec_sql("delete from fiche where 
f_id=$1",[$this->id]);
 
     }
     /*!\brief create the sql statement for retrieving all