From e4ffbd3dade28f6263f143437b9865b1c640b269 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 13 May 2017 00:05:19 +0200
Subject: Move force-https.default.txt

---
 CHANGELOG.md                 | 2 +-
 data/force-https.default.txt | 7 -------
 force-https.default.txt      | 7 +++++++
 lib/lib_rss.php              | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)
 delete mode 100644 data/force-https.default.txt
 create mode 100644 force-https.default.txt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index de3c2cef9..16234e159 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -200,7 +200,7 @@
 	* Cookie with `Secure` tag when used over HTTPS [#1117](https://github.com/FreshRSS/FreshRSS/pull/1117)
 	* Limit API post input to 1MB [#1118](https://github.com/FreshRSS/FreshRSS/pull/1118)
 * Features
-	* New list of domains for which to force HTTPS (for images, videos, iframes…) defined in `./data/force-https.default.txt` and `./data/force-https.txt` [#1083](https://github.com/FreshRSS/FreshRSS/issues/1083)
+	* New list of domains for which to force HTTPS (for images, videos, iframes…) defined in `./force-https.default.txt` and `./data/force-https.txt` [#1083](https://github.com/FreshRSS/FreshRSS/issues/1083)
 		* In particular useful for privacy and to avoid mixed content errors, e.g. to see YouTube videos when FreshRSS is in HTTPS
 	* Add sharing with “Journal du Hacker” [#1056](https://github.com/FreshRSS/FreshRSS/pull/1056)
 * UI
diff --git a/data/force-https.default.txt b/data/force-https.default.txt
deleted file mode 100644
index 044620098..000000000
--- a/data/force-https.default.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-dailymotion.com
-feedburner.com
-gravatar.com
-gstatic.com
-tumblr.com
-wordpress.com
-youtube.com
diff --git a/force-https.default.txt b/force-https.default.txt
new file mode 100644
index 000000000..044620098
--- /dev/null
+++ b/force-https.default.txt
@@ -0,0 +1,7 @@
+dailymotion.com
+feedburner.com
+gravatar.com
+gstatic.com
+tumblr.com
+wordpress.com
+youtube.com
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 1bf387712..7e14e638d 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -214,7 +214,7 @@ function customSimplePie() {
 		),
 	));
 	$https_domains = array();
-	$force = @file(DATA_PATH . '/force-https.default.txt', FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+	$force = @file(FRESHRSS_PATH . '/force-https.default.txt', FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
 	if (is_array($force)) {
 		$https_domains = array_merge($https_domains, $force);
 	}
-- 
cgit v1.2.3