diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-06-24 16:34:52 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-06-24 16:34:52 -0700 |
| commit | 5f3edabd4529471b2ab33532ad38bbd65758b0cd (patch) | |
| tree | e5d4e905df3bd9e689e2d752d589c0abce7df42b /mod | |
| parent | 86588bdd6cf765d2f334168da5e056923c440aba (diff) | |
| parent | 364a3cb9725949a786cc3ea96c514e37acfbd547 (diff) | |
| download | volse-hubzilla-5f3edabd4529471b2ab33532ad38bbd65758b0cd.tar.gz volse-hubzilla-5f3edabd4529471b2ab33532ad38bbd65758b0cd.tar.bz2 volse-hubzilla-5f3edabd4529471b2ab33532ad38bbd65758b0cd.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
doc/de/features.bb
view/de/messages.po
view/de/strings.php
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/directory.php | 5 | ||||
| -rw-r--r-- | mod/zotfeed.php | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/mod/directory.php b/mod/directory.php index 67074d8cd..fa328462c 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -365,6 +365,8 @@ function directory_content(&$a) { else { $maxheight = 94; + $dirtitle = (($globaldir) ? t('Global Directory') : t('Local Directory')); + $o .= "<script> var page_query = '" . $_GET['q'] . "'; var extra_args = '" . extra_query_args() . "' ; divmore_height = " . intval($maxheight) . "; </script>"; $o .= replace_macros($tpl, array( '$search' => $search, @@ -372,10 +374,9 @@ function directory_content(&$a) { '$finddsc' => t('Finding:'), '$safetxt' => htmlspecialchars($search,ENT_QUOTES,'UTF-8'), '$entries' => $entries, - '$dirlbl' => $suggest ? t('Channel Suggestions') : t('Directory'), + '$dirlbl' => $suggest ? t('Channel Suggestions') : $dirtitle, '$submit' => t('Find'), '$next' => alt_pager($a,$j['records'], t('next page'), t('previous page')) - )); diff --git a/mod/zotfeed.php b/mod/zotfeed.php index b2f2e0465..fffb0e4ab 100644 --- a/mod/zotfeed.php +++ b/mod/zotfeed.php @@ -9,7 +9,7 @@ function zotfeed_init(&$a) { $mindate = (($_REQUEST['mindate']) ? datetime_convert('UTC','UTC',$_REQUEST['mindate']) : ''); if(! $mindate) - $mindate = datetime_convert('UTC','UTC', 'now - 4 days'); + $mindate = datetime_convert('UTC','UTC', 'now - 14 days'); if(get_config('system','block_public') && (! get_account_id()) && (! remote_channel())) { $result['message'] = 'Public access denied'; @@ -29,7 +29,7 @@ function zotfeed_init(&$a) { $x = get_sys_channel(); if($x) $r = array($x); - $mindate = datetime_convert('UTC','UTC', 'now - 2 days'); + $mindate = datetime_convert('UTC','UTC', 'now - 14 days'); } if(! $r) { $result['message'] = 'Channel not found.'; |