From 2f68b084919437013cc6d977c0f077e541cf83f9 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 31 Mar 2012 16:40:42 +0200
Subject: [PATCH] fix eventsource for ie
---
core/js/eventsource.js | 2 +-
lib/eventsource.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/js/eventsource.js b/core/js/eventsource.js
index 34bce60c24..08259e02ca 100644
--- 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 dc28616c2d..cf10660b94 100644
--- 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){
--
GitLab