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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Haakon Meland Eriksen 2015-11-18 06:48:29 +01:00
commit 0d232c612b
3 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/widgets.php
View File

@ -1238,6 +1238,23 @@ function widget_album($args) {
if($args['title']) if($args['title'])
$title = $args['title']; $title = $args['title'];
/**
* This may return incorrect permissions if you have multiple directories of the same name.
* It is a limitation of the photo table using a name for a photo album instead of a folder hash
*/
if($album) {
$x = q("select hash from attach where filename = '%s' and uid = %d limit 1",
dbesc($album),
intval($owner_uid)
);
if($x) {
$y = attach_can_view_folder($owner_uid,get_observer_hash(),$x[0]['hash']);
if(! $y)
return '';
}
}
$order = 'DESC'; $order = 'DESC';
$r = q("SELECT p.resource_id, p.id, p.filename, p.type, p.scale, p.description, p.created FROM photo p INNER JOIN $r = q("SELECT p.resource_id, p.id, p.filename, p.type, p.scale, p.description, p.created FROM photo p INNER JOIN

7
mod/admin.php
View File

@ -1042,7 +1042,12 @@ function admin_page_plugins(&$a){
} }
$admin_form = ''; $admin_form = '';
if (is_array($a->plugins_admin) && in_array($plugin, $a->plugins_admin)){
$r = q("select * from addon where plugin_admin = 1 and name = '%s' limit 1",
dbesc($plugin)
);
if($r) {
@require_once("addon/$plugin/$plugin.php"); @require_once("addon/$plugin/$plugin.php");
if(function_exists($plugin.'_plugin_admin')) { if(function_exists($plugin.'_plugin_admin')) {
$func = $plugin.'_plugin_admin'; $func = $plugin.'_plugin_admin';

4
view/js/acl.js
View File

@ -31,7 +31,7 @@ function ACL(backend_url, preset) {
$("#acl-search").keypress(that.on_search); $("#acl-search").keypress(that.on_search);
/* startup! */ /* startup! */
that.get(0,1000); that.get(0,15000);
that.on_submit(); that.on_submit();
}); });
} }
@ -60,7 +60,7 @@ ACL.prototype.on_submit = function() {
ACL.prototype.search = function() { ACL.prototype.search = function() {
var srcstr = $("#acl-search").val(); var srcstr = $("#acl-search").val();
that.list_content.html(""); that.list_content.html("");
that.get(0, 1000, srcstr); that.get(0, 15000, srcstr);
}; };
ACL.prototype.on_search = function(event) { ACL.prototype.on_search = function(event) {