diff --git a/application/models/Webservice_model.php b/application/models/Webservice_model.php index c9cbdb1..a3fdc02 100644 --- a/application/models/Webservice_model.php +++ b/application/models/Webservice_model.php @@ -1902,7 +1902,7 @@ class Webservice_model extends CI_Model { $result = $this->db->query("SELECT CUST.customer_id,CUST.name,CUST.phone,CUST.profile_image, CUST.profile_image_qr,CHT.type AS friend_status FROM customer AS CUST - LEFT JOIN chats AS CHT ON ((CUST.customer_id=CHT.from_user OR CUST.customer_id=CHT.to_user) AND CHT.type=1) + LEFT JOIN chats AS CHT ON ((CUST.customer_id=CHT.from_user OR CUST.customer_id=CHT.to_user) AND CHT.type IN (0,1)) WHERE CUST.customer_id IN ($user_ids) AND customer_id NOT IN (SELECT from_user FROM chats diff --git a/application/views/Country/countryAddForm.php b/application/views/Country/countryAddForm.php index e5eae40..0e66141 100644 --- a/application/views/Country/countryAddForm.php +++ b/application/views/Country/countryAddForm.php @@ -66,8 +66,7 @@ <div class="form-group"> <label>Language</label> <input type="text" class="form-control required" data-parsley-trigger="change" - data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z]+$" - name="language" required="" value="<?= (isset($countryData->language))?$countryData->language:'' ?>"placeholder="Country Name"> + data-parsley-minlength="2" name="language" required="" value="<?= (isset($countryData->language))?$countryData->language:'' ?>"placeholder="Country Name"> <span class="glyphicon form-control-feedback"></span> </div> </div>