Merge branch 'master' into release_preview

new_admincp/applications/zsb/models/pic_model.php

@@ -774,7 +774,12 @@ class Pic_model extends MY_Model {
         if(GB_CITY == 'wh'){
             if($tbl == 'sell' && $id < 10310000) return 'upload';
             if($tbl == 'rent' && $id < 1577000) return 'upload';
-            return 'upload1';
+
+			if($tbl == 'sell' && ($id >= 10310000 && $id < 15591000)) return 'upload1';
+
+			if($tbl == 'rent' && ($id >= 1577000 && $id < 1809000)) return 'upload1';
+
+			return 'upload2';
         }
 
         if(GB_CITY!='nj') return 'upload';