From: Adam Magness Date: Mon, 5 Feb 2018 17:49:03 +0000 (-0500) Subject: Rebase X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4c93b592a591ff4821c6fd1cb16695379dfff2db;p=friendica.git Rebase fix from rebase --- diff --git a/mod/item.php b/mod/item.php index 76f1666244..57f83ea5ef 100644 --- a/mod/item.php +++ b/mod/item.php @@ -32,7 +32,6 @@ use Friendica\Util\DateTimeFormat; use Friendica\Util\Emailer; require_once 'include/enotify.php'; -require_once 'include/threads.php'; require_once 'include/text.php'; require_once 'include/items.php'; diff --git a/mod/photos.php b/mod/photos.php index 4c86d91010..7260bae9e2 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -29,7 +29,6 @@ require_once 'include/items.php'; require_once 'include/acl_selectors.php'; require_once 'include/bbcode.php'; require_once 'include/security.php'; -require_once 'include/threads.php'; function photos_init(App $a) { diff --git a/src/Model/Item.php b/src/Model/Item.php index 8c8ae48af9..b0bf3fedf0 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -27,7 +27,6 @@ use dba; use Text_LanguageDetect; require_once 'boot.php'; -require_once 'include/threads.php'; require_once 'include/items.php'; require_once 'include/text.php';