[Noalyss-commit] [noalyss] 127/238: Merge commit '3f53de417dd89e9a90a386404f93f8648155e046' into r700-currency

[Dany De Bontridder]

sparkyx pushed a commit to annotated tag rel7110
in repository noalyss.

commit b82aae9cbdc20008dc1d7e2c9566b04fdcbf21f4
Merge: f0499ac 3f53de4
Author: Dany De Bontridder <address@hidden>
Date:   Wed Dec 26 13:05:56 2018 +0100

    Merge commit '3f53de417dd89e9a90a386404f93f8648155e046' into r700-currency

 include/lib/manage_table_sql.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --cc include/lib/manage_table_sql.class.php
index b39e05a,51aef22..a60ce24
--- a/include/lib/manage_table_sql.class.php
+++ b/include/lib/manage_table_sql.class.php
@@@ -811,28 -811,26 +811,28 @@@ function check(
                       */
                      $idx=$p_row[$v];
                      /*
 -                    * Check if index exists
 -                    */
 +                     * Check if index exists
 +                     */
                      $array_to_search=$this->a_select[$v];
                      $value=$p_row[$v];
-                     $nb_search=count($array_to_search);
+                     
+                     
$nb_search=(is_array($array_to_search))?count($array_to_search):0;
                      $found=FALSE;
 -                    for ( $e=0;$e< $nb_search;$e++) {
 -                        if (isset ($array_to_search[$e]['value']) && 
$array_to_search[$e]['value']==$value ) {
 +                    for ($e=0; $e<$nb_search; $e++)
 +                    {
 +                        if 
(isset($array_to_search[$e]['value'])&&$array_to_search[$e]['value']==$value)
 +                        {
                              $found=TRUE;
                              echo td($array_to_search[$e]['label']);
                          }
                      }
  
 -                    if ( ! $found) {
 +                    if (!$found)
 +                    {
                          echo td("--");
 -
                      }
-                 }
 -                    
 -                }else {
 +                else
 +                {
                      echo td($p_row[$v]);
                  }
              }