X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=mod%2Fsubthread.php;h=a597b169872feb63a144aa5def4ae12d333ad2ac;hb=2196a0577b29dcec1ba4d2c32be10fa5f0e91034;hp=b85f461dcf85c291ba939a434648eb68b7bd52b7;hpb=9c2c4839968169a191084d6d2b0d629d82430e67;p=friendica.git

diff --git a/mod/subthread.php b/mod/subthread.php
index b85f461dcf..a597b16987 100644
--- a/mod/subthread.php
+++ b/mod/subthread.php
@@ -1,13 +1,16 @@
 <?php
 
+use Friendica\App;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
+
 require_once('include/security.php');
 require_once('include/bbcode.php');
 require_once('include/items.php');
 
-
 function subthread_content(App $a) {
 
-	if (! local_user() && ! remote_user()) {
+	if(! local_user() && ! remote_user()) {
 		return;
 	}
 
@@ -20,7 +23,7 @@ function subthread_content(App $a) {
 		dbesc($item_id)
 	);
 
-	if (! $item_id || (! dbm::is_result($r))) {
+	if(! $item_id || (! DBM::is_result($r))) {
 		logger('subthread: no item ' . $item_id);
 		return;
 	}
@@ -29,19 +32,19 @@ function subthread_content(App $a) {
 
 	$owner_uid = $item['uid'];
 
-	if (! can_write_wall($a,$owner_uid)) {
+	if(! can_write_wall($a,$owner_uid)) {
 		return;
 	}
 
 	$remote_owner = null;
 
-	if (! $item['wall']) {
+	if(! $item['wall']) {
 		// The top level post may have been written by somebody on another system
 		$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 			intval($item['contact-id']),
 			intval($item['uid'])
 		);
-		if (! dbm::is_result($r)) {
+		if (! DBM::is_result($r)) {
 			return;
 		}
 		if (! $r[0]['self']) {
@@ -55,7 +58,7 @@ function subthread_content(App $a) {
 		WHERE `contact`.`self` = 1 AND `contact`.`uid` = %d LIMIT 1",
 		intval($owner_uid)
 	);
-	if (dbm::is_result($r))
+	if (DBM::is_result($r))
 		$owner = $r[0];
 
 	if (! $owner) {
@@ -76,7 +79,7 @@ function subthread_content(App $a) {
 			intval($_SESSION['visitor_id']),
 			intval($owner_uid)
 		);
-		if (dbm::is_result($r))
+		if (DBM::is_result($r))
 			$contact = $r[0];
 	}
 	if (! $contact) {
@@ -87,7 +90,7 @@ function subthread_content(App $a) {
 
 	$post_type = (($item['resource-id']) ? t('photo') : t('status'));
 	$objtype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
-	$link = xmlify('<link rel="alternate" type="text/html" href="' . App::get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
+	$link = xmlify('<link rel="alternate" type="text/html" href="' . System::baseUrl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
 	$body = $item['body'];
 
 	$obj = <<< EOT
@@ -129,7 +132,7 @@ EOT;
 
 	$ulink = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]';
 	$alink = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
-	$plink = '[url=' . App::get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . ']' . $post_type . '[/url]';
+	$plink = '[url=' . System::baseUrl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . ']' . $post_type . '[/url]';
 	$arr['body'] =  sprintf( $bodyverb, $ulink, $alink, $plink );
 
 	$arr['verb'] = $activity;