diff options
author | friendica <info@friendica.com> | 2015-01-07 14:39:09 -0800 |
---|---|---|
committer | friendica <info@friendica.com> | 2015-01-07 14:39:09 -0800 |
commit | 0657195125675700eeb9bcd1bc92f4299cac0304 (patch) | |
tree | 2e6d2df8fd42b289b947a16f0c5f0009a2c98043 /boot.php | |
parent | a1e5a661fa8f87793cab0fe9c34f507dafb65d99 (diff) | |
parent | 087d6744fcd0c77cf3415b4ce6eaf50cdb63b4ef (diff) | |
download | volse-hubzilla-0657195125675700eeb9bcd1bc92f4299cac0304.tar.gz volse-hubzilla-0657195125675700eeb9bcd1bc92f4299cac0304.tar.bz2 volse-hubzilla-0657195125675700eeb9bcd1bc92f4299cac0304.zip |
Merge branch 'master' into trinidad
Diffstat (limited to 'boot.php')
-rwxr-xr-x | boot.php | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -221,7 +221,7 @@ define ( 'PAGE_NORMAL', 0x0000 ); define ( 'PAGE_HIDDEN', 0x0001 ); define ( 'PAGE_AUTOCONNECT', 0x0002 ); define ( 'PAGE_APPLICATION', 0x0004 ); -define ( 'PAGE_DIRECTORY_CHANNEL', 0x0008 ); // system channel used for directory synchronisation + define ( 'PAGE_PREMIUM', 0x0010 ); define ( 'PAGE_ADULT', 0x0020 ); define ( 'PAGE_CENSORED', 0x0040 ); // Site admin has blocked this channel from appearing in casual search results and site feeds @@ -554,7 +554,7 @@ define ( 'ITEM_DELAYED_PUBLISH', 0x0080); define ( 'ITEM_BUILDBLOCK', 0x0100); // Named thusly to make sure nobody confuses this with ITEM_BLOCKED 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 +define ( 'ITEM_PENDING_REMOVE', 0x0800); // deleted, notification period has lapsed /** * Item Flags |