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

Merge branch 'master' of https://github.com/redmatrix/redmatrix

Browse Source 
Conflicts:
	boot.php
	include/items.php
	util/messages.po
This commit is contained in:
redmatrix 2015-07-03 15:03:56 -07:00
commit a74631b554
4 changed files with 618 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -535,7 +535,7 @@ define ( 'ITEM_BUILDBLOCK', 0x0100); // Named thusly to make sure nobody co
//define ( 'ITEM_PDL', 0x0200); // Page Description Language - e.g. Comanche
define ( 'ITEM_BUG', 0x0400); // Is a bug, can be used by the internal bug tracker
define ( 'ITEM_PENDING_REMOVE', 0x0800); // deleted, notification period has lapsed
// Don't make us evaluate this same item again.
define ( 'ITEM_DOC', 0x1000); // hubzilla only, define here so that item import does the right thing
define ( 'ITEM_TYPE_POST', 0 );
define ( 'ITEM_TYPE_BLOCK', 1 );

1
include/items.php
View File

@ -1231,7 +1231,6 @@ function encode_item($item,$mirror = false) {
$x['item_delayed'] = $item['item_delayed'];
$x['item_pending_remove'] = $item['item_pending_remove'];
$x['item_blocked'] = $item['item_blocked'];
}

713
util/messages.po
View File

File diff suppressed because it is too large Load Diff

2
version.inc
View File

@ -1 +1 @@
2015-07-02.1081
2015-07-03.1082