mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-21 12:35:17 +00:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
c5981cbc9a
3 changed files with 12 additions and 9 deletions
|
@ -256,7 +256,7 @@ function item_permissions_sql($owner_id, $remote_observer = null) {
|
|||
$regexop = db_getfunc('REGEXP');
|
||||
$sql = sprintf(
|
||||
" AND ( NOT (deny_cid like '%s' OR deny_gid $regexop '%s')
|
||||
AND ( allow_cid like '%s' OR allow_gid $regexop '%s' OR ( allow_cid = '' AND allow_gid = '') )
|
||||
AND ( allow_cid like '%s' OR allow_gid $regexop '%s' OR ( allow_cid = '' AND allow_gid = '' AND item_private = 0 ) )
|
||||
)
|
||||
",
|
||||
dbesc(protect_sprintf( '%<' . $observer . '>%')),
|
||||
|
@ -291,7 +291,7 @@ function public_permissions_sql($observer_hash) {
|
|||
$regexop = db_getfunc('REGEXP');
|
||||
$sql = sprintf(
|
||||
" OR (( NOT (deny_cid like '%s' OR deny_gid $regexop '%s')
|
||||
AND ( allow_cid like '%s' OR allow_gid $regexop '%s' OR ( allow_cid = '' AND allow_gid = '') )
|
||||
AND ( allow_cid like '%s' OR allow_gid $regexop '%s' OR ( allow_cid = '' AND allow_gid = '' AND item_private = 0 ) )
|
||||
))
|
||||
",
|
||||
dbesc(protect_sprintf( '%<' . $observer_hash . '>%')),
|
||||
|
|
|
@ -1 +1 @@
|
|||
2015-09-03.1144
|
||||
2015-09-07.1148
|
||||
|
|
|
@ -1,9 +1,12 @@
|
|||
<div class="generic-content-wrapper">
|
||||
<h1>{{$title}}</h1>
|
||||
<b><a href="uexport/basic">{{$basictitle}}</a></b></p>
|
||||
<p>{{$basic}}</p>
|
||||
|
||||
<p><b><a href="uexport/complete">{{$fulltitle}}</a></b></p>
|
||||
<p>{{$full}}</p>
|
||||
<div class="section-title-wrapper">
|
||||
<h2>{{$title}}</h2>
|
||||
</div>
|
||||
<div class="section-content-wrapper">
|
||||
<b><a href="uexport/basic">{{$basictitle}}</a></b></p>
|
||||
<p>{{$basic}}</p>
|
||||
|
||||
<p><b><a href="uexport/complete">{{$fulltitle}}</a></b></p>
|
||||
<p>{{$full}}</p>
|
||||
</div>
|
||||
</div>
|
||||
|
|
Loading…
Reference in a new issue