Merge pull request #3861 from annando/direct-forum-post

[friendica.git] / mod / wallmessage.php

diff --git a/mod/wallmessage.php b/mod/wallmessage.php
index 257ba6a898f39e6e259f3a0a1d3a9f8f72fe9fe7..fe3b9a82a6f641deb968c1964f2b2e65d1f760d9 100644 (file)
--- a/mod/wallmessage.php
+++ b/mod/wallmessage.php
@@ -1,5 +1,8 @@
 <?php
 
+use Friendica\App;
+use \Friendica\Core\System;
+
 require_once('include/message.php');
 
 function wallmessage_post(App $a) {
@@ -43,12 +46,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){
@@ -115,14 +112,14 @@ function wallmessage_content(App $a) {
 
        $tpl = get_markup_template('wallmsg-header.tpl');
        $a->page['htmlhead'] .= replace_macros($tpl, array(
-               '$baseurl' => $a->get_baseurl(true),
+               '$baseurl' => System::baseUrl(true),
                '$nickname' => $user['nickname'],
                '$linkurl' => t('Please enter a link URL:')
        ));
 
        $tpl = get_markup_template('wallmsg-end.tpl');
        $a->page['end'] .= replace_macros($tpl, array(
-               '$baseurl' => $a->get_baseurl(true),
+               '$baseurl' => System::baseUrl(true),
                '$nickname' => $user['nickname'],
                '$linkurl' => t('Please enter a link URL:')
        ));