Commit 56976249 authored by Mario's avatar Mario

Merge branch 'dev'

parents bbc80c57 ed9665ec
$(document).ready(function() {
$('form').areYouSure({'addRemoveFieldsMarksDirty':true, 'message': aStr['leavethispage'] }); // Warn user about unsaved settings
});
......@@ -537,7 +537,7 @@ function chess_delete_game($game_id, $channel) {
if (!$items) {
return array('items' => null, 'status' => false);
} else {
$drop = drop_item($items[0]['id'], false, DROPITEM_NORMAL, true);
$drop = drop_item($items[0]['id'], false, DROPITEM_NORMAL);
return array('items' => $items, 'status' => (($drop === 1) ? true : false));
}
}
......
......@@ -103,7 +103,7 @@ function gallery_prepare_body(&$arr) {
$arr['html'] = mb_convert_encoding($arr['html'], 'HTML-ENTITIES', "UTF-8");
// LIBXML_HTML_NOIMPLIED does not work well without a parent element.
// We a parent div here and will remove it again later
// We will add a parent div here and will remove it again later.
@$dom->loadHTML('<div>' . $arr['html'] . '</div>', LIBXML_HTML_NODEFDTD | LIBXML_HTML_NOIMPLIED);
$xp = new DOMXPath($dom);
......@@ -166,22 +166,18 @@ function gallery_prepare_body(&$arr) {
case 1:
$row_height = 300;
$last_row = 'justify';
$margins = 0;
break;
case 2:
$row_height = 240;
$last_row = 'justify';
$margins = 3;
break;
case 3:
$row_height = 180;
$last_row = 'justify';
$margins = 3;
break;
default:
$row_height = 120;
$last_row = 'nojustify';
$margins = 3;
}
$js = <<<EOF
......@@ -202,8 +198,8 @@ function gallery_prepare_body(&$arr) {
rowHeight: '$row_height',
lastRow: '$last_row',
justifyThreshold: 0.5,
margins: $margins,
border: 0
border: 0,
margins: 3
}).on('jg.complete', function(e){ justifiedGalleryActive = false; setTimeout(scrollToItem, 100); });
}
</script>
......
......@@ -62,11 +62,12 @@ class Inbox extends \Zotlabs\Web\Controller {
pubcrawl_import_author($arr);
if($arr['result']) {
if(! empty($arr['result'])) {
$x['hash'] = $arr['result'];
}
else {
$x['address'] = $AS->obj['attributedTo'];
logger('pubcrawl_import_author failed for announce activity');
return;
}
$AS->sharee = xchan_fetch($x);
......
......@@ -659,11 +659,8 @@ function asencode_person($p) {
'width' => 1200,
];
}
$ret['url'] = [
'type' => 'Link',
'mediaType' => 'text/html',
'href' => $p['xchan_url']
];
$ret['url'] = $p['xchan_url'];
$c = channelx_by_hash($p['xchan_hash']);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment