Merge remote-tracking branch 'upstream/dev' into website-export

This commit is contained in:
Andrew Manning 2016-08-27 18:58:10 -04:00
commit b05474fc30

View File

@ -31,8 +31,8 @@ class Help extends \Zotlabs\Web\Controller {
if($r) { if($r) {
$o .= '<ul class="help-searchlist">'; $o .= '<ul class="help-searchlist">';
foreach($r as $rr) { foreach($r as $rr) {
$dirname = dirname($rr['sid']); $dirname = dirname($rr['v']);
$fname = basename($rr['sid']); $fname = basename($rr['v']);
$fname = substr($fname,0,strrpos($fname,'.')); $fname = substr($fname,0,strrpos($fname,'.'));
$path = trim(substr($dirname,4),'/'); $path = trim(substr($dirname,4),'/');