Merge branch 'master' of https://github.com/piwik/piwik into bugfix

2 files changed, 6 insertions, 0 deletions

diff --git a/core/Tracker/TableLogAction.php b/core/Tracker/TableLogAction.php
index 50696a70f3..2f66a268f6 100644
--- a/core/Tracker/TableLogAction.php
+++ b/core/Tracker/TableLogAction.php
@@ -269,6 +269,8 @@ class TableLogAction
         $actionsTypesStoredUnsanitized = array(
             $actionType == Action::TYPE_DOWNLOAD,
             $actionType == Action::TYPE_OUTLINK,
+            $actionType == Action::TYPE_PAGE_URL,
+            $actionType == Action::TYPE_CONTENT,
         );
 
         return in_array($actionType, $actionsTypesStoredUnsanitized);
diff --git a/core/Tracker/Visit/ReferrerSpamFilter.php b/core/Tracker/Visit/ReferrerSpamFilter.php
index 3d49362444..177200bf6a 100644
--- a/core/Tracker/Visit/ReferrerSpamFilter.php
+++ b/core/Tracker/Visit/ReferrerSpamFilter.php
@@ -58,6 +58,10 @@ class ReferrerSpamFilter
             $cache->save($cacheId, $list);
         }
 
+        if(!is_array($list)) {
+            Common::printDebug('Warning: could not read list of spammers from cache.');
+            return array();
+        }
         return $list;
     }