From dcf68720c15d71bbd2a6e94e41989888fae37d20 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 20 Oct 2016 15:48:42 +0200
Subject: [PATCH] Fix regression where UI object could be not created on some
 pages (#5484)

---
 program/include/rcmail_output_html.php | 4 ++++
 skins/larry/includes/footer.html       | 3 +++
 skins/larry/includes/header.html       | 8 --------
 skins/larry/includes/links.html        | 4 +++-
 skins/larry/ui.js                      | 8 +++++---
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php
index 8dda8c3c1..fca3ae77d 100644
--- a/program/include/rcmail_output_html.php
+++ b/program/include/rcmail_output_html.php
@@ -1077,6 +1077,10 @@ EOF;
                 }
                 break;
 
+            case 'add_label':
+                $this->add_label($attrib['name']);
+                break;
+
             // include a file
             case 'include':
                 $old_base_path = $this->base_path;
diff --git a/skins/larry/includes/footer.html b/skins/larry/includes/footer.html
index cade440bd..f64420d27 100644
--- a/skins/larry/includes/footer.html
+++ b/skins/larry/includes/footer.html
@@ -1,2 +1,5 @@
 <roundcube:object name="message" id="messagestack" condition="env:task != 'login'" />
 
+<script type="text/javascript">
+if (!window.UI) { var UI = new rcube_mail_ui(); }
+</script>
diff --git a/skins/larry/includes/header.html b/skins/larry/includes/header.html
index 8057bc30a..36783e395 100644
--- a/skins/larry/includes/header.html
+++ b/skins/larry/includes/header.html
@@ -1,13 +1,5 @@
 <script type="text/javascript">
-
-// UI startup
 var UI = new rcube_mail_ui();
-$(document).ready(function(){
-  UI.set('errortitle', '<roundcube:label name="errortitle" quoting="javascript" />');
-  UI.set('toggleoptions', '<roundcube:label name="toggleadvancedoptions" quoting="javascript" />');
-  UI.init();
-});
-
 </script>
 
 <div id="header">
diff --git a/skins/larry/includes/links.html b/skins/larry/includes/links.html
index a49e58826..2e2607e14 100644
--- a/skins/larry/includes/links.html
+++ b/skins/larry/includes/links.html
@@ -5,4 +5,6 @@
 <link rel="stylesheet" type="text/css" href="/<roundcube:var name="env:task" />.css" />
 <roundcube:endif />
 <!--[if IE 9]><link rel="stylesheet" type="text/css" href="/svggradients.css" /><![endif]-->
-<script type="text/javascript" src="/ui.js"></script>
\ No newline at end of file
+<script type="text/javascript" src="/ui.js"></script>
+<roundcube:add_label name="errortitle" />
+<roundcube:add_label name="toggleadvancedoptions" />
diff --git a/skins/larry/ui.js b/skins/larry/ui.js
index 121b3e4c4..0bd830494 100644
--- a/skins/larry/ui.js
+++ b/skins/larry/ui.js
@@ -60,6 +60,8 @@ function rcube_mail_ui()
     if (bw.tablet) {
       $('#viewport').attr('content', "width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0");
     }
+
+    $(document).ready(function() { me.init(); });
   }
 
 
@@ -285,8 +287,8 @@ function rcube_mail_ui()
       else if (rcmail.env.action == 'edit-prefs') {
         var legend = $('#preferences-details fieldset.advanced legend'),
           toggle = $('<a href="#toggle"></a>')
-            .text(env.toggleoptions)
-            .attr('title', env.toggleoptions)
+            .text(rcmail.gettext('toggleadvancedoptions'))
+            .attr('title', rcmail.gettext('toggleadvancedoptions'))
             .addClass('advanced-toggle');
 
         legend.click(function(e) {
@@ -446,7 +448,7 @@ function rcube_mail_ui()
           resizable: false,
           closeOnEscape: true,
           dialogClass: 'popupmessage ' + p.type,
-          title: env.errortitle,
+          title: rcmail.gettext('errortitle'),
           close: dialog_close,
           position: ['center', 'center'],
           hide: {effect: 'fadeOut'},