From 4095194cbb4973cd69f8dc4011d28cc5733c8eeb Mon Sep 17 00:00:00 2001
From: roundcube <roundcube@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Thu, 13 Apr 2006 18:07:06 +0000
Subject: Fixed parent.location problem for compose-links

git-svn-id: https://svn.roundcube.net/trunk@192 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/js/app.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'roundcubemail/program/js')

diff --git a/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js
index d2bf41e58..60daf8c32 100644
--- a/roundcubemail/program/js/app.js
+++ b/roundcubemail/program/js/app.js
@@ -835,14 +835,17 @@ function rcube_webmail()
           }
         else if (props)
            url += '&_to='+props;
-        
+
         // don't know if this is necessary...
         url = url.replace(/&_framed=1/, "");
 
         this.set_busy(true);
 
         // need parent in case we are coming from the contact frame
-        parent.window.location.href = url;
+        if (this.env.framed)
+          parent.location.href = url;
+        else
+          location.href = url;
         break;    
 
       case 'send':
-- 
cgit v1.2.3