From 28de3911825bde79ee5a92762940ef310baab737 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 06 Nov 2012 07:21:04 -0500
Subject: [PATCH] Recursively resolve paths of iframe contents; unify contentframe registration and reduce code-duplication
---
program/steps/addressbook/func.inc | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc
index 3a05080..cefe49e 100644
--- a/program/steps/addressbook/func.inc
+++ b/program/steps/addressbook/func.inc
@@ -367,12 +367,7 @@
if (!$attrib['id'])
$attrib['id'] = 'rcmcontactframe';
- $attrib['name'] = $attrib['id'];
-
- $OUTPUT->set_env('contentframe', $attrib['name']);
- $OUTPUT->set_env('blankpage', $attrib['src'] ? $OUTPUT->abs_url($attrib['src']) : 'program/resources/blank.gif');
-
- return html::iframe($attrib);
+ return $OUTPUT->frame($attrib, true);
}
--
Gitblit v1.9.1