diff --git a/lib/Haanga/lib/Haanga/Extension/Filter/Googlevizbarchart.php b/lib/Haanga/lib/Haanga/Extension/Filter/Googlevizbarchart.php index 0095861da8fbc0f22234cffd6515af80f1d6c3a9..9f41728a8f3e7e830f18331625649b93eaad7f77 100644 --- a/lib/Haanga/lib/Haanga/Extension/Filter/Googlevizbarchart.php +++ b/lib/Haanga/lib/Haanga/Extension/Filter/Googlevizbarchart.php @@ -37,7 +37,7 @@ class Haanga_Extension_Filter_GoogleVizBarChart{ foreach($varList as $v){ $name = $v['name']; $val = $v['value']; - $value = ($j==0)?"'".$k->$name->$val."'":$k->$name->$val; + $value = ($j==0)?"'".str_replace("'", "\'",$k->$name->$val)."'":$k->$name->$val; $data .=" data.setCell($i, $j, ".$value.");\n"; $j++; } diff --git a/lib/Haanga/lib/Haanga/Extension/Filter/Googlevizcolumnchart.php b/lib/Haanga/lib/Haanga/Extension/Filter/Googlevizcolumnchart.php index 9daaf3f00cc93311552944010d58590b1d9b8836..9b0b3e1ba2a6d87ebbbad9bf124699664da054d2 100644 --- a/lib/Haanga/lib/Haanga/Extension/Filter/Googlevizcolumnchart.php +++ b/lib/Haanga/lib/Haanga/Extension/Filter/Googlevizcolumnchart.php @@ -42,7 +42,7 @@ class Haanga_Extension_Filter_GoogleVizColumnChart{ foreach($varList as $v){ $name = $v['name']; $val = $v['value']; - $value = ($j==0)?"'".$k->$name->$val."'":$k->$name->$val; + $value = ($j==0)?"'".str_replace("'", "\'",$k->$name->$val)."'":$k->$name->$val; $data .=" data.setCell($i, $j, ".$value.");\n"; $j++; } diff --git a/lib/Haanga/lib/Haanga/Extension/Filter/Googlevizlinechart.php b/lib/Haanga/lib/Haanga/Extension/Filter/Googlevizlinechart.php index db2b07e4171497de474fcfe4ed67f4eb52d96f96..a7976607c291625b586c75adc83a8eb1d11a7d48 100644 --- a/lib/Haanga/lib/Haanga/Extension/Filter/Googlevizlinechart.php +++ b/lib/Haanga/lib/Haanga/Extension/Filter/Googlevizlinechart.php @@ -37,7 +37,7 @@ class Haanga_Extension_Filter_GoogleVizLineChart{ foreach($varList as $v){ $name = $v['name']; $val = $v['value']; - $value = ($j==0)?"'".$k->$name->$val."'":$k->$name->$val; + $value = ($j==0)?"'".str_replace("'", "\'",$k->$name->$val)."'":$k->$name->$val; $data .=" data.setCell($i, $j, ".$value.");\n"; $j++; } diff --git a/lib/Haanga/lib/Haanga/Extension/Filter/Googlevizpiechart.php b/lib/Haanga/lib/Haanga/Extension/Filter/Googlevizpiechart.php index a8517eb033047a819ecb20d3c082bb29af698989..5118ccafd34ac1434e4c56315749787637e5f224 100644 --- a/lib/Haanga/lib/Haanga/Extension/Filter/Googlevizpiechart.php +++ b/lib/Haanga/lib/Haanga/Extension/Filter/Googlevizpiechart.php @@ -43,8 +43,8 @@ class Haanga_Extension_Filter_GoogleVizPieChart{ foreach($varList as $v){ $name = $v['name']; $val = $v['value']; - $value = ($j==0)?"'".$k->$name->$val."'":$k->$name->$val; - $data .=" data.setCell($i, $j, ".$value.");\n"; + $value = ($j==0)?"'".str_replace("'", "\'",$k->$name->$val)."'":$k->$name->$val; + $data .=" data.setCell($i, $j, ".str_replace("'", "\'",$value).");\n"; $j++; } $i++; diff --git a/lib/Haanga/lib/Haanga/Extension/Filter/Googleviztable.php b/lib/Haanga/lib/Haanga/Extension/Filter/Googleviztable.php index 029da5b1d0f5fc4a892822f844abf20b7b97908c..61f19ab2faa53e70755f9644cbf6013244b97c5b 100644 --- a/lib/Haanga/lib/Haanga/Extension/Filter/Googleviztable.php +++ b/lib/Haanga/lib/Haanga/Extension/Filter/Googleviztable.php @@ -26,7 +26,7 @@ class Haanga_Extension_Filter_GoogleVizTable{ foreach($varList as $v){ $name = $v['name']; $val = $v['value']; - $data .=" data.setCell($i, $j, '".$k->$name->$val."');\n"; + $data .=" data.setCell($i, $j, '".str_replace("'", "\'",$k->$name->$val)."');\n"; $j++; } $i++;