aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-09-02 16:01:29 -0700
committerfriendica <info@friendica.com>2013-09-02 16:01:29 -0700
commit7c775db9d6b9dc68bc05cded7ab93357aeeb9c3f (patch)
treeb11ac8cfaaec527f8c78a128c6382ef75a405a5a
parentc8461e703884735a604fb405d3db43f68cf5909c (diff)
downloadvolse-hubzilla-7c775db9d6b9dc68bc05cded7ab93357aeeb9c3f.tar.gz
volse-hubzilla-7c775db9d6b9dc68bc05cded7ab93357aeeb9c3f.tar.bz2
volse-hubzilla-7c775db9d6b9dc68bc05cded7ab93357aeeb9c3f.zip
fix webpage storage
-rw-r--r--include/conversation.php2
-rwxr-xr-xinclude/text.php2
-rw-r--r--mod/item.php10
3 files changed, 5 insertions, 9 deletions
diff --git a/include/conversation.php b/include/conversation.php
index c40691bba..8cee4f34f 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1055,7 +1055,7 @@ function status_editor($a,$x,$popup=false) {
'$return_path' => $a->query_string,
'$action' => $a->get_baseurl(true) . '/item',
'$share' => (x($x,'button') ? $x['button'] : t('Share')),
- '$webpage' => (x($x,'webpage') ? '1' : ''),
+ '$webpage' => (x($x,'webpage') ? $x['webpage'] : ''),
'$placeholdpagetitle' => t('Page link title'),
'$pagetitle' => (x($x,'pagetitle') ? $x['pagetitle'] : ''),
'$upload' => t('Upload photo'),
diff --git a/include/text.php b/include/text.php
index 71374f1f9..b0b519851 100755
--- a/include/text.php
+++ b/include/text.php
@@ -92,7 +92,7 @@ function z_input_filter($channel_id,$s,$type = 'text/bbcode') {
$r = q("select account_id, account_roles from account left join channel on channel_account_id = account_id where channel_id = %d limit 1",
intval($channel_id)
);
- if($r && ($r[0]['account_roles'] & ACCOUNT_ROLE_ALLOWEXEC)) {
+ if($r && ($r[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE)) {
if(local_user() && (get_account_id() == $r[0]['account_id'])) {
return $s;
}
diff --git a/mod/item.php b/mod/item.php
index 50644607d..ce484999b 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -44,7 +44,7 @@ function item_post(&$a) {
call_hooks('post_local_start', $_REQUEST);
- logger('postvars ' . print_r($_REQUEST,true), LOGGER_DATA);
+// logger('postvars ' . print_r($_REQUEST,true), LOGGER_DATA);
$api_source = ((x($_REQUEST,'api_source') && $_REQUEST['api_source']) ? true : false);
@@ -320,7 +320,6 @@ function item_post(&$a) {
$body = z_input_filter($profile_uid,$body,$mimetype);
}
-logger('body: ' . $body);
if($mimetype === 'text/bbcode') {
@@ -368,11 +367,9 @@ logger('body: ' . $body);
*/
if(! $preview) {
- fix_attached_photo_permissions($profile_uid,$owner_xchan['xchan_hash'],$body,
- $str_contact_allow,$str_group_allow,$str_contact_deny,$str_group_deny);
+ fix_attached_photo_permissions($profile_uid,$owner_xchan['xchan_hash'],$body,$str_contact_allow,$str_group_allow,$str_contact_deny,$str_group_deny);
- fix_attached_file_permissions($channel,$observer['xchan_hash'],$body,
- $str_contact_allow,$str_group_allow,$str_contact_deny,$str_group_deny);
+ fix_attached_file_permissions($channel,$observer['xchan_hash'],$body,$str_contact_allow,$str_group_allow,$str_contact_deny,$str_group_deny);
}
@@ -487,7 +484,6 @@ logger('body: ' . $body);
}
}
-
$item_flags = ITEM_UNSEEN;
$item_restrict = ITEM_VISIBLE;