merge from branch 1.5.3.2 (r12300-r12332)

git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@12336 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-11-30 08:07:14 +00:00
commit 90bf16474c
3 changed files with 47 additions and 4 deletions

View file

@ -278,7 +278,7 @@
{
$click_count_columns = array();
foreach($this->columns as $column){
if($column->show() && $column instanceof ClickCountExpression)
if($column->show() && is_a($column, 'ClickCountExpression'))
$click_count_columns[] = $column;
}
return $click_count_columns;