diff --git a/lib/pivotstate/pivotstate.class.php b/lib/pivotstate/pivotstate.class.php index 956c2390ce..4456cfd878 100644 --- a/lib/pivotstate/pivotstate.class.php +++ b/lib/pivotstate/pivotstate.class.php @@ -89,6 +89,14 @@ class pivotState */ public $langs; + /** + * client languages. + * + * @var array + * @access public + */ + public $clientLang; + /** * Pivot state variables. * @@ -283,13 +291,13 @@ class pivotState /** * Get field options. * - * @param string $lang * @access public * @return array */ - public function getFieldOptions($lang) + public function getFieldOptions() { $options = array(); + $lang = $this->clientLang; foreach($this->fieldSettings as $settings) { $options[] = array('text' => isset($settings[$lang]) ? $settings[$lang] : $settings['name'], 'value' => $settings['name'], 'key' => $settings['name']); @@ -407,13 +415,13 @@ class pivotState /** * Build cols for query sql with lang. * - * @param string $lang * @access public * @return object */ - public function buildQuerySqlCols($lang) + public function buildQuerySqlCols() { $cols = array(); + $lang = $this->clientLang; foreach($this->fieldSettings as $field => $settings) { $settings = (array)$settings; @@ -426,6 +434,18 @@ class pivotState return $this; } + /** + * Set clientLang. + * + * @param string $clientLang + * @access public + * @return void + */ + public function setClientLang($clientLang) + { + $this->clientLang = $clientLang; + } + /** * Set action. * diff --git a/module/bi/model.php b/module/bi/model.php index e1fcf0526f..e1d6fcacec 100644 --- a/module/bi/model.php +++ b/module/bi/model.php @@ -1028,7 +1028,7 @@ class biModel extends model $stateObj->setPager($total); $stateObj->setFieldSettings($columns); - $stateObj->buildQuerySqlCols($this->app->getClientLang()); + $stateObj->buildQuerySqlCols(); } catch(Exception $e) {