合并分支 'admin_check_fix' 到 'master'

Admin check fix

修复发布房源图片未进审核表的bug

查看合并请求 !1

new_admincp/applications/zsb/models/sell_model.php

@@ -146,6 +146,7 @@ class Sell_model extends Sell_base_model {
             }
             $token = explode("=",$v);
             $pid = intval($token[1]);
+
             $filename = $v;
 
              // 图片不以http开头 跳过
@@ -153,7 +154,7 @@ class Sell_model extends Sell_base_model {
                 continue;
             }
             //$filename = substr($v, 0, strpos($v, '?'));
-            $idkind   = substr( $token[0],-3);
+//            $idkind   = substr( $token[0],-3);
             $title = $pics['p_title'][$k]=='图片描述..限30字' ? '': strip_tags($pics['p_title'][$k]);
             $sort = $pics['p_sort'][$k];
             $flg = $sort == 9 || $sort == 10 ? 1 : 0;//图库选择的图片不需要再次审核。
@@ -192,24 +193,25 @@ class Sell_model extends Sell_base_model {
                 'flg' => $flg, 'isfrom' => 2, 'isinfotype' => $pics['infotype']
             );
             $picid = $this->pic_model->insert_house_pic($insert_data_house, $tbl, $house_id);
-            if($idkind=='pid' && $pid > 0 && !$fromblockimg && !$flg)
+//            if($idkind=='pid' && $pid > 0 && !$fromblockimg && !$flg)
+            if(!$fromblockimg && !$flg)
             {
                 //审图用，获取缓存图片库中的图片信息
-                $parr = $this->pic_model->find_temp_by_id($pid);
+//                $parr = $this->pic_model->find_temp_by_id($pid);
                 //审图用，组合图片信息
                 $return[$temp]['pictbl'] = $this->pic_model->get_upload_table_name($tbl, $house_id);
                 $return[$temp]['picid'] = $picid;
                 $return[$temp]['picurl'] = $filename;
                 $return[$temp]['sort'] = $sort;
                 $return[$temp]['surface'] = 0;
-                if(isset($parr['from_device']) && $parr['from_device'] != '')
-                {
-                    $return[$temp]['from_device'] = $parr['from_device'];
-                }
-                if (isset($parr['file_md5']) && $parr['file_md5'] != '')
-                {
-                    $return[$temp]['file_md5'] = $parr['file_md5'];
-                }
+//                if(isset($parr['from_device']) && $parr['from_device'] != '')
+//                {
+//                    $return[$temp]['from_device'] = $parr['from_device'];
+//                }
+//                if (isset($parr['file_md5']) && $parr['file_md5'] != '')
+//                {
+//                    $return[$temp]['file_md5'] = $parr['file_md5'];
+//                }
                 $temp++;
             }