harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/redmatrix/redmatrix into pending_merge

Browse Source 
Conflicts:
	util/messages.po
This commit is contained in:
redmatrix 2015-09-07 04:06:27 -07:00
commit 2f52b6c164
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/security.php
View File

@ -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 . '>%')),

2
version.inc
View File

@ -1 +1 @@
2015-09-03.1144
2015-09-07.1148

15
view/tpl/uexport.tpl
View File

@ -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>