Remove unused upubkey and uprvkey from queries

[friendica.git] / mod / editpost.php

diff --git a/mod/editpost.php b/mod/editpost.php
index f3746317a14ba25e7cf70b9fd2aa8b2c0f925480..57c9339047707e2c95ce4889d30c8f201f82e170 100644 (file)
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -1,5 +1,10 @@
 <?php
 
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
+
 require_once('include/acl_selectors.php');
 
 function editpost_content(App $a) {
@@ -23,7 +28,7 @@ function editpost_content(App $a) {
                intval(local_user())
        );
 
-       if (! dbm::is_result($itm)) {
+       if (! DBM::is_result($itm)) {
                notice( t('Item not found') . EOL);
                return;
        }
@@ -34,7 +39,7 @@ function editpost_content(App $a) {
 
        $tpl = get_markup_template('jot-header.tpl');
        $a->page['htmlhead'] .= replace_macros($tpl, array(
-               '$baseurl' => App::get_baseurl(),
+               '$baseurl' => System::baseUrl(),
                '$ispublic' => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
                '$geotag' => $geotag,
                '$nickname' => $a->user['nickname']
@@ -42,7 +47,7 @@ function editpost_content(App $a) {
 
        $tpl = get_markup_template('jot-end.tpl');
        $a->page['end'] .= replace_macros($tpl, array(
-               '$baseurl' => App::get_baseurl(),
+               '$baseurl' => System::baseUrl(),
                '$ispublic' => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
                '$geotag' => $geotag,
                '$nickname' => $a->user['nickname']
@@ -59,7 +64,7 @@ function editpost_content(App $a) {
        $jotplugins = '';
        $jotnets = '';
 
-       $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
+       $mail_disabled = ((function_exists('imap_open') && (! Config::get('system','imap_disabled'))) ? 0 : 1);
 
        $mail_enabled = false;
        $pubmail_enabled = false;
@@ -68,7 +73,7 @@ function editpost_content(App $a) {
                $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
                        intval(local_user())
                );
-               if (dbm::is_result($r)) {
+               if (DBM::is_result($r)) {
                        $mail_enabled = true;
                        if(intval($r[0]['pubmail']))
                                $pubmail_enabled = true;
@@ -116,7 +121,7 @@ function editpost_content(App $a) {
                '$ptyp' => $itm[0]['type'],
                '$content' => undo_post_tagging($itm[0]['body']),
                '$post_id' => $post_id,
-               '$baseurl' => App::get_baseurl(),
+               '$baseurl' => System::baseUrl(),
                '$defloc' => $a->user['default-location'],
                '$visitor' => 'none',
                '$pvisit' => 'none',