diff options
| author | zotlabs <mike@macgirvin.com> | 2017-01-25 14:40:04 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-01-25 14:40:04 -0800 |
| commit | 5bc6941b577f59784dd2eb46c7dae32862b52576 (patch) | |
| tree | 885e22d1f83cbf98b9866fa8ea4f4c3804ee22cd /Zotlabs | |
| parent | 45dbd31d286838254cd1ae60e4ebb39c112526be (diff) | |
| download | volse-hubzilla-5bc6941b577f59784dd2eb46c7dae32862b52576.tar.gz volse-hubzilla-5bc6941b577f59784dd2eb46c7dae32862b52576.tar.bz2 volse-hubzilla-5bc6941b577f59784dd2eb46c7dae32862b52576.zip | |
resolve the linked item delete issue by declaring what types of linked items cannot be deleted
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Lib/NativeWikiPage.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Lib/NativeWikiPage.php b/Zotlabs/Lib/NativeWikiPage.php index 79b7548ce..85a1e8bed 100644 --- a/Zotlabs/Lib/NativeWikiPage.php +++ b/Zotlabs/Lib/NativeWikiPage.php @@ -20,7 +20,7 @@ class NativeWikiPage { $sql_extra = item_permissions_sql($channel_id,$observer_hash); - $r = q("select * from item where resource_type = 'nwikipage' and resource_id = '%s' and uid = %d and item_hidden = 0 + $r = q("select * from item where resource_type = 'nwikipage' and resource_id = '%s' and uid = %d and item_deleted = 0 and item_hidden = 0 $sql_extra group by mid", dbesc($resource_id), intval($channel_id) @@ -277,7 +277,7 @@ class NativeWikiPage { $r = null; if($ids) { - $r = q("select * from item where resource_type = 'nwikipage' and resource_id = '%s' and uid = %d and id in ( $ids ) $sql_extra", + $r = q("select * from item where resource_type = 'nwikipage' and resource_id = '%s' and uid = %d and id in ( $ids ) and item_deleted = 0 $sql_extra", dbesc($resource_id), intval($channel_id) ); |