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

Merge remote-tracking branch 'mike/master' into dev

Browse Source
This commit is contained in:
Mario Vavti 2018-05-31 13:06:33 +02:00
commit b438ffead4
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Zotlabs/Module/Acl.php
View File

@ -94,8 +94,7 @@ class Acl extends \Zotlabs\Web\Controller {
. " then POSITION('" . protect_sprintf(dbesc($search)) . " then POSITION('" . protect_sprintf(dbesc($search))
. "' IN xchan_name) else position('" . protect_sprintf(dbesc(punify($search))) . "' IN xchan_addr) end, "; . "' IN xchan_name) else position('" . protect_sprintf(dbesc(punify($search))) . "' IN xchan_addr) end, ";
$col = ((strpos($search,'@') !== false) ? 'xchan_addr' : 'xchan_name' ); $sql_extra3 = "AND ( xchan_addr like " . protect_sprintf( "'%" . dbesc(punify($search)) . "%'" ) . " OR xchan_name like " . protect_sprintf( "'%" . dbesc($search) . "%'" ) . " ) ";
$sql_extra3 = "AND $col like " . protect_sprintf( "'%" . dbesc(($col === 'xchan_addr') ? punify($search) : $search) . "%'" ) . " ";
} }
else { else {

2
include/plugin.php
View File

@ -559,7 +559,7 @@ function get_widget_info($widget){
$checkpaths = [ $checkpaths = [
"Zotlabs/SiteWidget/$ucwidget.php", "Zotlabs/SiteWidget/$ucwidget.php",
"Zotlibs/Widget/$ucwidget.php", "Zotlabs/Widget/$ucwidget.php",
"addon/$ucwidget/$ucwidget.php", "addon/$ucwidget/$ucwidget.php",
"addon/$widget.php" "addon/$widget.php"
]; ];