Skip to content

T
TimeOutAdmin
Commit f7a11e39 by Tobin
Options

Merge branch 'master' into 'dev_production'

faq RTL issue See merge request !311
parents 30d5c680 643548ea
Showing with 3 additions and 5 deletions
application/models/Webservice_model.php
...@@ -223,8 +223,7 @@ class Webservice_model extends CI_Model { ...@@ -223,8 +223,7 @@ class Webservice_model extends CI_Model {
$lang = $countryData['language_code']; $lang = $countryData['language_code'];
$settings = getSettings(); $settings = getSettings();
$sql = "SELECT faq FROM translator_policies $sql = "SELECT faq FROM translator_policies WHERE language_code='$lang'";
WHERE language_code='$lang' OR language_code='EN'";
$settingsDetails = $this->db->query($sql)->row_array(); $settingsDetails = $this->db->query($sql)->row_array();
$settingsDetails['contact_number'] = $settings['contact_number']; $settingsDetails['contact_number'] = $settings['contact_number'];
...@@ -879,8 +878,7 @@ class Webservice_model extends CI_Model { ...@@ -879,8 +878,7 @@ class Webservice_model extends CI_Model {
} }
$settings = getSettings(); $settings = getSettings();
$sql = "SELECT instruction FROM translator_policies $sql = "SELECT instruction FROM translator_policies WHERE language_code='$lang'";
WHERE language_code='$lang' OR language_code='EN'";
$settingsDetails = $this->db->query($sql)->row_array(); $settingsDetails = $this->db->query($sql)->row_array();
$settingsDetails['contact_number'] = $settings['contact_number']; $settingsDetails['contact_number'] = $settings['contact_number'];
...@@ -1581,7 +1579,7 @@ class Webservice_model extends CI_Model { ...@@ -1581,7 +1579,7 @@ class Webservice_model extends CI_Model {
$lang = $countryData['language_code']; $lang = $countryData['language_code'];
$sql = "SELECT privacy_policy,terms_and_conditions $sql = "SELECT privacy_policy,terms_and_conditions
FROM translator_policies WHERE (language_code='$lang' OR language_code='EN')"; FROM translator_policies WHERE language_code='$lang'";
$setDetails = $this->db->query($sql)->row_array(); $setDetails = $this->db->query($sql)->row_array();
$setDetails['contact_number'] = $settings['contact_number']; $setDetails['contact_number'] = $settings['contact_number'];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment