Merge remote-tracking branch 'upstream/develop' into 1706-lock

[friendica.git] / mod / wallmessage.php

diff --git a/mod/wallmessage.php b/mod/wallmessage.php
index e0c702cdb0ca45abfcb9e1cdd96e405c058325a1..72897c0657f77adc057bc738085d91d1bf9e79d2 100644 (file)
--- a/mod/wallmessage.php
+++ b/mod/wallmessage.php
@@ -1,8 +1,10 @@
 <?php
 
+use Friendica\App;
+
 require_once('include/message.php');
 
-function wallmessage_post(App &$a) {
+function wallmessage_post(App $a) {
 
        $replyto = get_my_url();
        if(! $replyto) {
@@ -43,12 +45,6 @@ function wallmessage_post(App &$a) {
                return;
        }
 
-       // Work around doubled linefeeds in Tinymce 3.5b2
-
-       $body = str_replace("\r\n","\n",$body);
-       $body = str_replace("\n\n","\n",$body);
-
-
        $ret = send_wallmessage($user, $body, $subject, $replyto);
 
        switch($ret){
@@ -73,7 +69,7 @@ function wallmessage_post(App &$a) {
 }
 
 
-function wallmessage_content(App &$a) {
+function wallmessage_content(App $a) {
 
        if(! get_my_url()) {
                notice( t('Permission denied.') . EOL);
@@ -113,16 +109,9 @@ function wallmessage_content(App &$a) {
                return;
        }
 
-
-
-       $editselect = 'none';
-       if( feature_enabled(local_user(), 'richtext') )
-               $editselect = '/(profile-jot-text|prvmail-text)/';
-
        $tpl = get_markup_template('wallmsg-header.tpl');
        $a->page['htmlhead'] .= replace_macros($tpl, array(
                '$baseurl' => $a->get_baseurl(true),
-               '$editselect' => $editselect,
                '$nickname' => $user['nickname'],
                '$linkurl' => t('Please enter a link URL:')
        ));
@@ -130,13 +119,10 @@ function wallmessage_content(App &$a) {
        $tpl = get_markup_template('wallmsg-end.tpl');
        $a->page['end'] .= replace_macros($tpl, array(
                '$baseurl' => $a->get_baseurl(true),
-               '$editselect' => $editselect,
                '$nickname' => $user['nickname'],
                '$linkurl' => t('Please enter a link URL:')
        ));
-       
 
-       
        $tpl = get_markup_template('wallmessage.tpl');
        $o .= replace_macros($tpl,array(
                '$header' => t('Send Private Message'),