fix eventsource for ie

diff --git a/core/js/eventsource.js b/core/js/eventsource.js
index 34bce60c24a77178125fb5d9be752adae9b8fcc4..08259e02cae46adef9b943744b091e11d1e38917 100644 (file)
--- a/core/js/eventsource.js
+++ b/core/js/eventsource.js
@@ -68,7 +68,7 @@ OC.EventSource=function(src,data){
 OC.EventSource.fallBackSources=[];
 OC.EventSource.iframeCount=0;//number of fallback iframes
 OC.EventSource.fallBackCallBack=function(id,type,data){
-       OC.EventSource.fallBackSources[id].fallBackCallBack(type,JSON.parse(data));
+       OC.EventSource.fallBackSources[id].fallBackCallBack(type,data);
 }
 OC.EventSource.prototype={
        typelessListeners:[],

diff --git a/lib/eventsource.php b/lib/eventsource.php
index dc28616c2dd0816bebc364fa06d62c5c5db31caa..cf10660b94cef8eef84f1de02b8dca807dd97b69 100644 (file)
--- a/lib/eventsource.php
+++ b/lib/eventsource.php
@@ -59,7 +59,7 @@ class OC_EventSource{
                        $type=null;
                }
                if($this->fallback){
-                       $response='<script type="text/javascript">window.parent.OC.EventSource.fallBackCallBack('.$this->fallBackId.',"'.$type.'","'.json_encode($data).'")</script>'.PHP_EOL;
+                       $response='<script type="text/javascript">window.parent.OC.EventSource.fallBackCallBack('.$this->fallBackId.',"'.$type.'",'.json_encode($data).')</script>'.PHP_EOL;
                        echo $response;
                }else{
                        if($type){