Merge branch 'HTTPS_Everywhere' into dev

2 files changed, 5 insertions, 4 deletions

diff --git a/lib/SimplePie/SimplePie.php b/lib/SimplePie/SimplePie.php
index 61bad4e9d..a84f6dab3 100644
--- a/lib/SimplePie/SimplePie.php
+++ b/lib/SimplePie/SimplePie.php
@@ -1236,7 +1236,7 @@ class SimplePie
 
 	/**
 	 * Set the list of domains for which force HTTPS.
-	 * @see SimplePie_Misc::https_url()
+	 * @see SimplePie_Sanitize::set_https_domains()
 	 * FreshRSS
 	 */
 	public function set_https_domains($domains = array())
diff --git a/lib/SimplePie/SimplePie/Sanitize.php b/lib/SimplePie/SimplePie/Sanitize.php
index f656909a0..09294344e 100644
--- a/lib/SimplePie/SimplePie/Sanitize.php
+++ b/lib/SimplePie/SimplePie/Sanitize.php
@@ -75,11 +75,12 @@ class SimplePie_Sanitize
 
 	/**
 	 * List of domains for which force HTTPS.
-	 * @see SimplePie_Misc::https_url()
-	 * Array is tree split at DNS levels. Example array('biz' => true, 'com' => array('example' => true), 'example' => array('test') => array('www' => true));
+	 * @see SimplePie_Sanitize::set_https_domains()
+	 * Array is tree split at DNS levels. Example:
+	 * array('biz' => true, 'com' => array('example' => true), 'net' => array('example') => array('www' => true))
 	 * FreshRSS
 	 */
-	var $https_domains = array('com' => array('youtube' => true));
+	var $https_domains = array('com' => array('dailymotion' => true, 'youtube' => true));
 
 	public function __construct()
 	{