Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-19 16:35:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

directory issue

Browse source
This commit is contained in:
zotlabs 2019-06-30 19:10:12 -07:00
parent 1933d0f3dd
commit 18dc941526
4 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Zotlabs/Lib/Libzotdir.php
View file

@ -148,7 +148,7 @@ class Libzotdir {
$current_order = (($_REQUEST['order']) ? $_REQUEST['order'] : $directory_sort_order);
$suggest = (($_REQUEST['suggest']) ? '&suggest=' . $_REQUEST['suggest'] : '');
$url = 'directory?f=&';
$url = 'directory?f=';
$tmp = array_merge($_GET,$_POST);
unset($tmp['suggest']);
@ -158,7 +158,8 @@ class Libzotdir {
unset($tmp['safe']);
unset($tmp['req']);
unset($tmp['f']);
$forumsurl = $url . http_build_query($tmp) . $suggest;
$q = http_build_query($tmp);
$forumsurl = $url . (($q) ? '&' . $q : '') . $suggest;
$o = replace_macros(get_markup_template('dir_sort_links.tpl'), [
'$header' => t('Directory Options'),

4
Zotlabs/Module/Dircensor.php
View file

@ -42,10 +42,10 @@ class Dircensor extends Controller {
info( t('Entry censored') . EOL);
}
else {
info( t('Entry censored') . EOL);
info( t('Entry uncensored') . EOL);
}
return;
goaway(z_root() . '/directory');
}

6
Zotlabs/Module/Directory.php
View file

@ -333,11 +333,11 @@ class Directory extends Controller {
if ($karr) {
if (local_channel()) {
$r = q("select keywords from profile where uid = %d and is_default = 1 limit 1",
$pk = q("select keywords from profile where uid = %d and is_default = 1 limit 1",
intval(local_channel())
);
if ($r) {
$keywords = str_replace(',',' ', $r[0]['keywords']);
if ($pk) {
$keywords = str_replace(',',' ', $pk[0]['keywords']);
$keywords = str_replace(' ',' ', $keywords);
$marr = explode(' ', $keywords);
}

6
Zotlabs/Widget/Notifications.php
View file

@ -14,11 +14,11 @@ class Notifications {
'type' => 'network',
'icon' => 'th',
'severity' => 'secondary',
'label' => t('New Network Activity'),
'title' => t('New Network Activity Notifications'),
'label' => t('New Stream Activity'),
'title' => t('New Stream Activity Notifications'),
'viewall' => [
'url' => 'network',
'label' => t('View your network activity')
'label' => t('View your stream activity')
],
'markall' => [
'label' => t('Mark all notifications read')