diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-05-31 13:06:33 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-05-31 13:06:33 +0200 |
| commit | b438ffead455df7935c8423ed668cb1c2367fe47 (patch) | |
| tree | 587f2883c737e3e5bae9126aae259dd61cdb9f06 | |
| parent | cbaaa1c57ffed0b0a11a7d4cf9a492c26e577194 (diff) | |
| parent | f0690aadcc456386828f8bfba4d0a1007d09d9df (diff) | |
| download | volse-hubzilla-b438ffead455df7935c8423ed668cb1c2367fe47.tar.gz volse-hubzilla-b438ffead455df7935c8423ed668cb1c2367fe47.tar.bz2 volse-hubzilla-b438ffead455df7935c8423ed668cb1c2367fe47.zip | |
Merge remote-tracking branch 'mike/master' into dev
| -rw-r--r-- | Zotlabs/Module/Acl.php | 3 | ||||
| -rwxr-xr-x | include/plugin.php | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php index 2678aeb7a..7b52e88b5 100644 --- a/Zotlabs/Module/Acl.php +++ b/Zotlabs/Module/Acl.php @@ -94,8 +94,7 @@ class Acl extends \Zotlabs\Web\Controller { . " then POSITION('" . protect_sprintf(dbesc($search)) . "' 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 $col like " . protect_sprintf( "'%" . dbesc(($col === 'xchan_addr') ? punify($search) : $search) . "%'" ) . " "; + $sql_extra3 = "AND ( xchan_addr like " . protect_sprintf( "'%" . dbesc(punify($search)) . "%'" ) . " OR xchan_name like " . protect_sprintf( "'%" . dbesc($search) . "%'" ) . " ) "; } else { diff --git a/include/plugin.php b/include/plugin.php index 28d27619f..734c20d79 100755 --- a/include/plugin.php +++ b/include/plugin.php @@ -559,7 +559,7 @@ function get_widget_info($widget){ $checkpaths = [ "Zotlabs/SiteWidget/$ucwidget.php", - "Zotlibs/Widget/$ucwidget.php", + "Zotlabs/Widget/$ucwidget.php", "addon/$ucwidget/$ucwidget.php", "addon/$widget.php" ]; |