Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-19 21:15:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of /home/macgirvin/z into dev

Browse source
This commit is contained in:
nobody 2021-07-02 01:06:11 -07:00
commit e6f302229e
3 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Zotlabs/Lib/Activity.php
View file

@ -1082,15 +1082,15 @@ class Activity {
$ret['id'] = $i['mid'];
$token = IConfig::get($i,'ocap','relay');
if ($token) {
if (defined('USE_BEARCAPS')) {
$ret['id'] = 'bear:?u=' . $ret['id'] . '&t=' . $token;
}
else {
$ret['id'] = $ret['id'] . '?token=' . $token;
}
}
// $token = IConfig::get($i,'ocap','relay');
// if ($token) {
// if (defined('USE_BEARCAPS')) {
// $ret['id'] = 'bear:?u=' . $ret['id'] . '&t=' . $token;
// }
// else {
// $ret['id'] = $ret['id'] . '?token=' . $token;
// }
// }
$ret['published'] = datetime_convert('UTC','UTC',$i['created'],ATOM_TIME);
if ($i['created'] !== $i['edited']) {

27
Zotlabs/Module/Item.php
View file

@ -1440,9 +1440,14 @@ class Item extends Controller {
echo json_encode(array('preview' => $o));
killme();
}
if($orig_post)
// Let 'post_local' event listeners know if this is an edit.
// We will unset it immediately afterward.
if ($orig_post) {
$datarray['edit'] = true;
}
// suppress duplicates, *unless* you're editing an existing post. This could get picked up
// as a duplicate if you're editing it very soon after posting it initially and you edited
// some attribute besides the content, such as title or categories.
@ -1464,17 +1469,21 @@ class Item extends Controller {
}
call_hooks('post_local',$datarray);
if(x($datarray,'cancel')) {
// This is no longer needed
unset($datarray['edit']);
if (x($datarray,'cancel')) {
logger('mod_item: post cancelled by plugin or duplicate suppressed.');
if($return_path)
if ($return_path) {
goaway(z_root() . "/" . $return_path);
if($api_source)
return ( [ 'success' => false, 'message' => 'operation cancelled' ] );
}
if ($api_source) {
return ( [ 'success' => false, 'message' => 'operation cancelled' ] );
}
$json = array('cancel' => 1);
$json['reload'] = z_root() . '/' . $_REQUEST['jsreload'];
echo json_encode($json);
killme();
json_return_and_die($json);
}

2
boot.php
View file

@ -17,7 +17,7 @@ use Zotlabs\Daemon\Run;
* @brief This file defines some global constants and includes the central App class.
*/
define ( 'STD_VERSION', '21.06.26' );
define ( 'STD_VERSION', '21.07.02' );
define ( 'ZOT_REVISION', '10.0' );
define ( 'DB_UPDATE_VERSION', 1248 );