Rebase

fix from rebase

diff --git a/mod/item.php b/mod/item.php
index 76f16662444e00ca1c6c8c92152d525ca3eb5b9c..57f83ea5ef1a90844088989614bc371cadf40366 100644 (file)
--- 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 4c86d91010c03e4a5b3b3783f7c8c10c1e4c785b..7260bae9e24e4ad72daca209601e7a0f86e159c1 100644 (file)
--- 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 8c8ae48af99350342eb00da908de789211842038..b0bf3fedf0c9173d851b671ff555ea8821a16134 100644 (file)
--- 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';