aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-01-06 20:12:34 -0800
committerfriendica <info@friendica.com>2015-01-06 20:12:34 -0800
commit3ef487418df8465143cc0393803b2a1ff221697f (patch)
tree0f4d6c3feb14ca992eacf0c5e65b45d09ba10a27
parentfbe0610ce9a4ef62da8aba166250485f56e73d03 (diff)
downloadvolse-hubzilla-3ef487418df8465143cc0393803b2a1ff221697f.tar.gz
volse-hubzilla-3ef487418df8465143cc0393803b2a1ff221697f.tar.bz2
volse-hubzilla-3ef487418df8465143cc0393803b2a1ff221697f.zip
don't allow admin to delete the sys channel from the channel manage page
-rwxr-xr-xboot.php2
-rw-r--r--mod/admin.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/boot.php b/boot.php
index 54e5676e2..0c23a284a 100755
--- a/boot.php
+++ b/boot.php
@@ -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
diff --git a/mod/admin.php b/mod/admin.php
index 0e580960a..74a373738 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -827,7 +827,7 @@ function admin_page_channels(&$a){
/* get channels */
$total = q("SELECT count(*) as total FROM channel where not (channel_pageflags & %d)>0",
- intval(PAGE_REMOVED)
+ intval(PAGE_REMOVED|PAGE_SYSTEM)
);
if($total) {
$a->set_pager_total($total[0]['total']);
@@ -837,7 +837,7 @@ function admin_page_channels(&$a){
$order = " order by channel_name asc ";
$channels = q("SELECT * from channel where not ( channel_pageflags & %d )>0 $order limit %d offset %d ",
- intval(PAGE_REMOVED),
+ intval(PAGE_REMOVED|PAGE_SYSTEM),
intval($a->pager['itemspage']),
intval($a->pager['start'])
);