From 3c69a7a24a76ec5ecf5df91dfdc2ac18010e2694 Mon Sep 17 00:00:00 2001
From: yllar <yllar.pajus@gmail.com>
Date: Wed, 12 Aug 2009 16:13:11 -0400
Subject: [PATCH] sv_SE update
---
program/include/rcube_template.php | 39 +++++----------------------------------
1 files changed, 5 insertions(+), 34 deletions(-)
diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php
index d4c3464..3d894b5 100755
--- a/program/include/rcube_template.php
+++ b/program/include/rcube_template.php
@@ -289,7 +289,7 @@
{
if ($templ != 'iframe') {
// prevent from endless loops
- if ($this->app->plugins->is_processing('render_page')) {
+ if ($exit != 'recur' && $this->app->plugins->is_processing('render_page')) {
raise_error(array('code' => 505, 'type' => 'php', 'message' => 'Recursion alert: ignoring output->send()'), true, false);
return;
}
@@ -840,9 +840,9 @@
else if (in_array($attrib['command'], $a_static_commands)) {
$attrib['href'] = rcmail_url($attrib['command']);
}
- else if ($attrib['command'] == 'permaurl' && !empty($this->env['permaurl'])) {
- $attrib['href'] = $this->env['permaurl'];
- }
+ else if ($attrib['command'] == 'permaurl' && !empty($this->env['permaurl'])) {
+ $attrib['href'] = $this->env['permaurl'];
+ }
}
// overwrite attributes
@@ -855,35 +855,6 @@
JS_OBJECT_NAME,
$command,
$attrib['prop']
- );
- }
- if ($command && $attrib['imageover']) {
- $attrib['onmouseover'] = sprintf(
- "return %s.button_over('%s','%s')",
- JS_OBJECT_NAME,
- $command,
- $attrib['id']
- );
- $attrib['onmouseout'] = sprintf(
- "return %s.button_out('%s','%s')",
- JS_OBJECT_NAME,
- $command,
- $attrib['id']
- );
- }
-
- if ($command && $attrib['imagesel']) {
- $attrib['onmousedown'] = sprintf(
- "return %s.button_sel('%s','%s')",
- JS_OBJECT_NAME,
- $command,
- $attrib['id']
- );
- $attrib['onmouseup'] = sprintf(
- "return %s.button_out('%s','%s')",
- JS_OBJECT_NAME,
- $command,
- $attrib['id']
);
}
@@ -905,7 +876,7 @@
$link_attrib = array('href', 'onclick', 'onmouseover', 'onmouseout', 'onmousedown', 'onmouseup', 'target');
}
else if ($attrib['type']=='link') {
- $btn_content = $attrib['label'] ? $attrib['label'] : $attrib['command'];
+ $btn_content = isset($attrib['content']) ? $attrib['content'] : ($attrib['label'] ? $attrib['label'] : $attrib['command']);
$link_attrib = array('href', 'onclick', 'title', 'id', 'class', 'style', 'tabindex', 'target');
}
else if ($attrib['type']=='input') {
--
Gitblit v1.9.1