|
@@ -780,7 +780,7 @@ class ModelDb
|
|
if(is_mobile())
|
|
if(is_mobile())
|
|
{
|
|
{
|
|
$sql = $this->buildSelectSql($options);
|
|
$sql = $this->buildSelectSql($options);
|
|
- $result = DB::getAll($sql,($options['lock'] === true || $options['master'] === true || defined('TRANS_MASTER')) ? 'master' : 'slave');
|
|
|
|
|
|
+ $result = DB::getAll($sql,($options['lock'] === true || $options['master'] === true) ? 'master' : 'slave');
|
|
return $result;
|
|
return $result;
|
|
}
|
|
}
|
|
else
|
|
else
|
|
@@ -794,7 +794,7 @@ class ModelDb
|
|
return $_cache[$key];
|
|
return $_cache[$key];
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- $result = DB::getAll($sql, ($options['lock'] === true || $options['master'] === true || defined('TRANS_MASTER')) ? 'master' : 'slave');
|
|
|
|
|
|
+ $result = DB::getAll($sql, ($options['lock'] === true || $options['master'] === true) ? 'master' : 'slave');
|
|
if ($options['cache'] === true && !isset($_cache[$key])) {
|
|
if ($options['cache'] === true && !isset($_cache[$key])) {
|
|
$_cache[$key] = $result;
|
|
$_cache[$key] = $result;
|
|
}
|
|
}
|