Merge branch 'master' into 2.x-twig

Conflicts:
	.travis.yml

3 files changed, 5 insertions, 2 deletions

diff --git a/plugins/Overlay/API.php b/plugins/Overlay/API.php
index 1b9d943f26..413406fe43 100644
--- a/plugins/Overlay/API.php
+++ b/plugins/Overlay/API.php
@@ -28,7 +28,6 @@ class Piwik_Overlay_API
 
     /**
      * Get translation strings
-     * @ignore
      */
     public function getTranslations($idSite)
     {
diff --git a/plugins/Overlay/Overlay.php b/plugins/Overlay/Overlay.php
index d7b950491e..b7bf6c3da4 100644
--- a/plugins/Overlay/Overlay.php
+++ b/plugins/Overlay/Overlay.php
@@ -14,7 +14,7 @@ class Piwik_Overlay extends Piwik_Plugin
     public function getInformation()
     {
         return array(
-            'description'     => Piwik_Translate('Overlay_PluginDescription'),
+            'description'     => Piwik_Translate('Overlay_PluginDescription') . ' Note: Requires the Transitions plugin enabled.',
             'author'          => 'Piwik',
             'author_homepage' => 'http://piwik.org/',
             'version'         => Piwik_Version::VERSION,
diff --git a/plugins/Overlay/templates/rowaction.js b/plugins/Overlay/templates/rowaction.js
index ff525c1e38..a3a48f1d43 100644
--- a/plugins/Overlay/templates/rowaction.js
+++ b/plugins/Overlay/templates/rowaction.js
@@ -50,6 +50,10 @@ DataTable_RowActions_Registry.register({
     },
 
     isAvailableOnReport: function (dataTableParams) {
+        // Overlay plugin only works when Transitions plugin is enabled
+        if (!window.DataTable_RowActions_Transitions) {
+            return false;
+        }
         return DataTable_RowActions_Transitions.isPageUrlReport(dataTableParams.module, dataTableParams.action);
     },