Merge remote-tracking branch 'origin/master'1.12-b4

4 files changed, 9 insertions, 3 deletions

diff --git a/.travis.yml b/.travis.yml
index 8cd19d50d7..b97221bdab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,6 +25,7 @@ matrix:
 script: ./travis.sh
 
 before_script:
+  - echo `date`
   - mysql -e 'create database piwik_test;'
   - ./tests/travis/prepare.sh
   - ./tests/travis/setup_webserver.sh
diff --git a/README.md b/README.md
index 7debd70d21..0d1dec1d0b 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 Piwik is the leading Free/Libre open source Web Analytics software.
 
-Piwik is a full featured PHP MySQL software program that you download and install on your own webserver. 
+Piwik is a full featured PHP MySQL software program that you download and install on your own webserver.
 At the end of the five minute installation process you will be given a JavaScript code.
 Simply copy and paste this tag on websites you wish to track and access your analytics reports in real time.
 
diff --git a/plugins/CoreHome/templates/popover.js b/plugins/CoreHome/templates/popover.js
index d91059ec21..c5d5d039d5 100644
--- a/plugins/CoreHome/templates/popover.js
+++ b/plugins/CoreHome/templates/popover.js
@@ -47,6 +47,11 @@ var Piwik_Popover = (function () {
             }
         });
 
+        // override the undocumented _title function to ensure that the title attribute is not escaped (according to jQueryUI bug #6016)
+        container.data( "uiDialog" )._title = function(title) {
+            title.html( this.options.title );
+        };
+
         isOpen = true;
     };
 
@@ -124,7 +129,7 @@ var Piwik_Popover = (function () {
 
         /** Set the title of the popover */
         setTitle: function (titleHtml) {
-            container.dialog({title: titleHtml});
+            container.dialog('option', 'title', titleHtml);
         },
 
         /** Set inner HTML of the popover */
diff --git a/plugins/Dashboard/templates/dashboardWidget.js b/plugins/Dashboard/templates/dashboardWidget.js
index 617f03d4c6..9fb5dc4d28 100755
--- a/plugins/Dashboard/templates/dashboardWidget.js
+++ b/plugins/Dashboard/templates/dashboardWidget.js
@@ -120,7 +120,7 @@
 
             var currentWidget = this.element;
             $('body').on('click.dashboardWidget', function (ev) {
-                if (ev.target.className == "ui-widget-overlay") {
+                if (/ui-widget-overlay/.test(ev.target.className)) {
                     $(currentWidget).dialog("close");
                 }
             });