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

make editwebpage use status_editor() and fix storing of layout on webpage creation

Browse Source
This commit is contained in:
Mario Vavti
2016-05-09 11:56:42 +02:00
parent c8f686b8a5
commit 24c1dc528d
4 changed files with 91 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/conversation.php
View File

@@ -1144,7 +1144,7 @@ function status_editor($a, $x, $popup = false) {
if($mimeselect)
$mimeselect = mimetype_select($x['profile_uid'], $mimetype);
else
$mimeselect = '<input type="hidden" name="mimetype" value="' . $x['mimetype'] . '" />';
$mimeselect = '<input type="hidden" name="mimetype" value="' . $mimetype . '" />';
$weblink = (($mimetype === 'text/bbcode') ? t('Insert web link') : false);
if(x($x, 'hide_weblink'))
@@ -1154,6 +1154,15 @@ function status_editor($a, $x, $popup = false) {
if(x($x, 'hide_attach'))
$writefiles = false;
$layout = ((x($x,'layout')) ? $x['layout'] : 'default');
$layoutselect = ((x($x,'layoutselect')) ? $x['layoutselect'] : false);
if($layoutselect)
$layoutselect = layout_select($x['profile_uid'], $layout);
else
$layoutselect = '<input type="hidden" name="layout_mid" value="' . $layout . '" />';
/*
$layoutselect = '';
if(array_key_exists('layout', $x) && $x['layout']) {
if($x['layout'] === 'choose') {
@@ -1162,7 +1171,7 @@ function status_editor($a, $x, $popup = false) {
else
$layoutselect = '<input type="hidden" name="layout_mid" value="' . $x['layout'] . '" />';
}
*/
if(array_key_exists('channel_select',$x) && $x['channel_select']) {
require_once('include/identity.php');
$id_select = identity_selector();

4
include/items.php
View File

@@ -2223,7 +2223,7 @@ function item_store($arr, $allow_exec = false, $deliver = true) {
dbesc($arr['layout_mid']),
intval($arr['uid'])
);
if((! $l) || (! ($l[0]['item_type'] != ITEM_TYPE_PDL)))
if((! $l) || ($l[0]['item_type'] != ITEM_TYPE_PDL))
unset($arr['layout_mid']);
}
@@ -5664,4 +5664,4 @@ function sync_an_item($channel_id,$item_id) {
);
build_sync_packet($channel_d,array('item' => array(encode_item($sync_item[0],true)),'item_id' => $rid));
}
}
}