harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into tres

Browse Source 
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
This commit is contained in:
friendica
2015-01-29 15:09:35 -08:00
parent ff68ea6087 872b165eb2
commit 912be23e16
167 changed files with 1001 additions and 954 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mod/editpost.php
View File

@@ -9,7 +9,7 @@ function editpost_content(&$a) {
$o = '';
if(! local_user()) {
if(! local_channel()) {
notice( t('Permission denied.') . EOL);
return;
}
@@ -23,7 +23,7 @@ function editpost_content(&$a) {
$itm = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d and author_xchan = '%s' LIMIT 1",
intval($post_id),
intval(local_user()),
intval(local_channel()),
dbesc(get_observer_hash())
);
@@ -33,7 +33,7 @@ function editpost_content(&$a) {
}
$plaintext = true;
// if(feature_enabled(local_user(),'richtext'))
// if(feature_enabled(local_channel(),'richtext'))
// $plaintext = false;
$channel = $a->get_channel();
@@ -77,7 +77,7 @@ function editpost_content(&$a) {
$category = '';
$catsenabled = ((feature_enabled(local_user(),'categories')) ? 'categories' : '');
$catsenabled = ((feature_enabled(local_channel(),'categories')) ? 'categories' : '');
if ($catsenabled){
$itm = fetch_post_tags($itm);
@@ -136,8 +136,8 @@ function editpost_content(&$a) {
'$lockstate' => $lockstate,
'$acl' => '',
'$bang' => '',
'$profile_uid' => local_user(),
'$preview' => true, // ((feature_enabled(local_user(),'preview')) ? t('Preview') : ''),
'$profile_uid' => local_channel(),
'$preview' => true, // ((feature_enabled(local_channel(),'preview')) ? t('Preview') : ''),
'$jotplugins' => $jotplugins,
'$sourceapp' => t($a->sourcename),
'$catsenabled' => $catsenabled,