diff options
| author | zotlabs <mike@macgirvin.com> | 2016-11-15 02:12:30 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2016-11-15 02:12:30 -0800 |
| commit | 0f5a166cceef6dcfb5f29077122eabd09ef290be (patch) | |
| tree | bc4080ce445784a513491bcd4e57846aa2c61e2d | |
| parent | d59f450819242f0bf71f6c2ed85483b44fd0dbbf (diff) | |
| download | volse-hubzilla-0f5a166cceef6dcfb5f29077122eabd09ef290be.tar.gz volse-hubzilla-0f5a166cceef6dcfb5f29077122eabd09ef290be.tar.bz2 volse-hubzilla-0f5a166cceef6dcfb5f29077122eabd09ef290be.zip | |
still a bit of wiki permission weirdness, this should catch the major ones
| -rw-r--r-- | include/wiki.php | 5 | ||||
| -rw-r--r-- | view/tpl/wiki.tpl | 5 | ||||
| -rw-r--r-- | view/tpl/wikilist.tpl | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/include/wiki.php b/include/wiki.php index d52308b08..1d1e20e27 100644 --- a/include/wiki.php +++ b/include/wiki.php @@ -192,8 +192,9 @@ function wiki_exists_by_name($uid, $urlName) { function wiki_get_permissions($resource_id, $owner_id, $observer_hash) { // TODO: For now, only the owner can edit $sql_extra = item_permissions_sql($owner_id, $observer_hash); - $r = q("SELECT * FROM item WHERE resource_type = '%s' AND resource_id = '%s' $sql_extra LIMIT 1", - dbesc(WIKI_ITEM_RESOURCE_TYPE), + $r = q("SELECT * FROM item WHERE uid = %d and resource_type = '%s' AND resource_id = '%s' $sql_extra LIMIT 1", + intval($owner_id), + dbesc(WIKI_ITEM_RESOURCE_TYPE), dbesc($resource_id) ); diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index 4e76a79be..26a0a72e8 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -544,10 +544,5 @@ {{else}} $('#new-wiki-button').hide(); {{/if}} - {{if $showPageControls}} - $('#edit-wiki-button').show(); - {{else}} - $('#edit-wiki-button').hide(); - {{/if}} }); </script>
\ No newline at end of file diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl index 3997741dc..eb6dbc722 100644 --- a/view/tpl/wikilist.tpl +++ b/view/tpl/wikilist.tpl @@ -3,7 +3,7 @@ <ul class="nav nav-pills nav-stacked"> {{if $wikis}} {{foreach $wikis as $wiki}} - <li>{{if $owner}}<a href="#" onclick="wiki_show_edit_wiki_form('{{$wiki.title}}', '{{$wiki.resource_id}}'); return false;" class="pull-right wikilist" title="{{$edit}}"><i id="edit-wiki-button" class="fa fa-pencil"></i></a>{{/if}} + <li>{{if $owner}}<a href="#" onclick="wiki_show_edit_wiki_form('{{$wiki.title}}', '{{$wiki.resource_id}}'); return false;" class="pull-right wikilist" title="{{$edit}}"><i class="fa fa-pencil"></i></a>{{/if}} <a href="#" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;" title="{{$download}}" class="pull-right wikilist"><i class="fa fa-download"></i></a> <a href="/wiki/{{$channel}}/{{$wiki.urlName}}/Home" title="{{$view}}">{{$wiki.title}}</a> </li> |