From fd0f50695ed2037857bb031f0da22140db2f6064 Mon Sep 17 00:00:00 2001
From: Adam Magness <adam.magness@gmail.com>
Date: Tue, 7 Nov 2017 23:00:18 -0500
Subject: [PATCH] Class file relocation

changes related to Issue #3878
---
 diaspora/diaspora.php     | 3 ++-
 mailstream/mailstream.php | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php
index 9675d7a6..64388bbd 100755
--- a/diaspora/diaspora.php
+++ b/diaspora/diaspora.php
@@ -10,6 +10,7 @@
 require_once("addon/diaspora/Diaspora_Connection.php");
 
 use Friendica\Core\PConfig;
+use Friendica\Database\DBM;
 
 function diaspora_install() {
 	register_hook('post_local',           'addon/diaspora/diaspora.php', 'diaspora_post_local');
@@ -136,7 +137,7 @@ function diaspora_settings(&$a,&$s) {
 	$status = "";
 
 	$r = q("SELECT `addr` FROM `contact` WHERE `self` AND `uid` = %d", intval(local_user()));
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		$status = sprintf(t("Please remember: You can always be reached from Diaspora with your Friendica handle %s. "), $r[0]['addr']);
 		$status .= t('This connector is only meant if you still want to use your old Diaspora account for some time. ');
 		$status .= sprintf(t('However, it is preferred that you tell your Diaspora contacts the new handle %s instead.'), $r[0]['addr']);
diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index 8ff5f69f..e7721e9a 100644
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -8,6 +8,7 @@
 
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
+use Friendica\Database\DBM;
 
 function mailstream_install() {
 	register_hook('plugin_settings', 'addon/mailstream/mailstream.php', 'mailstream_plugin_settings');
@@ -167,7 +168,7 @@ function mailstream_do_images($a, &$item, &$attachments) {
 
 function mailstream_sender($item) {
 	$r = q('SELECT * FROM `contact` WHERE `id` = %d', $item['contact-id']);
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		$contact = $r[0];
 		if ($contact['name'] != $item['author-name']) {
 			return $contact['name'] . ' - ' . $item['author-name'];
@@ -208,7 +209,7 @@ function mailstream_subject($item) {
 	// Don't look more than 100 levels deep for a subject, in case of loops
 	for ($i = 0; ($i < 100) && $parent; $i++) {
 		$r = q("SELECT `thr-parent`, `title` FROM `item` WHERE `uri` = '%s'", dbesc($parent));
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			break;
 		}
 		if ($r[0]['thr-parent'] === $parent) {
-- 
2.39.5