Predpokladana a Doporucena cena pro debily (wolfuv pozadavek)

[mirrors/SokoMan.git] / index.php

diff --git a/index.php b/index.php
index 94d800268479350da856fd6a0ac8a2d25ebcbcd1..f1744a4a17fe63cb429b2efaa180ee23df26bc74 100755 (executable)
--- a/index.php
+++ b/index.php
@@ -641,8 +641,8 @@ class Sklad_DB extends PDO {
                        'model' => array('barcode'=>'model_id')
                );
                $fields_search = array(
-                       'item'  => array('item_id','item_serial','model_name','barcode_name','model_barcode','model_descript','producer_name','vendor_name'),
-                       'model' => array('model_id','model_name','barcode_name','model_barcode','model_descript','producer_name')
+                       'item'  => array('item_id','item_serial','model_name','barcode_name','model_descript','producer_name','vendor_name'),
+                       'model' => array('model_id','model_name','barcode_name','model_descript','producer_name')
                ); //TODO Autodetect
                $group_concat = array(
                        'model' => array('barcode_name'=>'model_id')
@@ -727,7 +727,9 @@ class Sklad_DB extends PDO {
        }
 
        function safe_query_fetch($sql, $fatal=true, $fetch_flags = PDO::FETCH_ASSOC, $translate=true) {
-               $result = $this->safe_query($sql, $fatal)->fetchAll($fetch_flags);
+               $result = $this->safe_query($sql, $fatal);
+               if(!$fatal && !$result) return $result;
+               $result = $result->fetchAll($fetch_flags);
                $this->load_backend_data_to_query_results($result);
                if($translate) $this->translate_query_results($result);
                return $result;