aboutsummaryrefslogtreecommitdiffstats
path: root/mod/rpost.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-01-29 15:09:35 -0800
committerfriendica <info@friendica.com>2015-01-29 15:09:35 -0800
commit912be23e1627211fb417c4b7bced414cbbe38ef0 (patch)
tree2b8567d800624167b3eadf37c8855deb0ba74b0b /mod/rpost.php
parentff68ea608786a698ad46637ef13854ac1b1e6beb (diff)
parent872b165eb2bb5d632a12f2d7e1a28e195c2d5348 (diff)
downloadvolse-hubzilla-912be23e1627211fb417c4b7bced414cbbe38ef0.tar.gz
volse-hubzilla-912be23e1627211fb417c4b7bced414cbbe38ef0.tar.bz2
volse-hubzilla-912be23e1627211fb417c4b7bced414cbbe38ef0.zip
Merge branch 'master' into tres
Conflicts: include/group.php include/text.php mod/acl.php mod/channel.php mod/connections.php mod/display.php mod/group.php mod/item.php mod/locs.php mod/network.php mod/photos.php mod/ping.php mod/starred.php mod/viewsrc.php
Diffstat (limited to 'mod/rpost.php')
-rw-r--r--mod/rpost.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/mod/rpost.php b/mod/rpost.php
index 933db24e3..2bea18c43 100644
--- a/mod/rpost.php
+++ b/mod/rpost.php
@@ -29,8 +29,8 @@ function rpost_content(&$a) {
$o = '';
- if(! local_user()) {
- if(remote_user()) {
+ if(! local_channel()) {
+ if(remote_channel()) {
// redirect to your own site.
// We can only do this with a GET request so you'll need to keep the text short or risk getting truncated
// by the wretched beast called 'suhosin'. All the browsers now allow long GET requests, but suhosin
@@ -83,7 +83,7 @@ function rpost_content(&$a) {
}
$plaintext = true;
-// if(feature_enabled(local_user(),'richtext'))
+// if(feature_enabled(local_channel(),'richtext'))
// $plaintext = false;
if(array_key_exists('type', $_REQUEST) && $_REQUEST['type'] === 'html') {
@@ -119,7 +119,7 @@ function rpost_content(&$a) {
'bang' => '',
// 'channel_select' => true,
'visitor' => true,
- 'profile_uid' => local_user(),
+ 'profile_uid' => local_channel(),
'title' => $_REQUEST['title'],
'body' => $_REQUEST['body'],
'source' => ((x($_REQUEST,'source')) ? strip_tags($_REQUEST['source']) : ''),