aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-09-15 03:52:37 -0700
committerfriendica <info@friendica.com>2013-09-15 03:52:37 -0700
commit033a9f67e7310e7ec1185b9a673abd9452600476 (patch)
tree5d77e6743e5325a661d4faa0f79b3d0fd7a54be4 /mod
parent129a119c84d87bffe099cea7ac5b0ed511c26f80 (diff)
parenta7cd3f7dfe3fa82300401a217b298c78a438c39c (diff)
downloadvolse-hubzilla-033a9f67e7310e7ec1185b9a673abd9452600476.tar.gz
volse-hubzilla-033a9f67e7310e7ec1185b9a673abd9452600476.tar.bz2
volse-hubzilla-033a9f67e7310e7ec1185b9a673abd9452600476.zip
Merge https://github.com/friendica/red into zpull
Diffstat (limited to 'mod')
-rw-r--r--mod/channel.php23
1 files changed, 12 insertions, 11 deletions
diff --git a/mod/channel.php b/mod/channel.php
index 652084cf0..5a66f5e07 100644
--- a/mod/channel.php
+++ b/mod/channel.php
@@ -64,17 +64,18 @@ function channel_content(&$a, $update = 0, $load = false) {
$category = $datequery = $datequery2 = '';
- if(argc() > 2) {
- for($x = 2; $x < argc(); $x ++) {
- if(is_a_date_arg(argv($x))) {
- if($datequery)
- $datequery2 = escape_tags(argv($x));
- else
- $datequery = escape_tags(argv($x));
- }
- }
- }
-
+ // if(argc() > 2) {
+ // for($x = 2; $x < argc(); $x ++) {
+ // if(is_a_date_arg(argv($x))) {
+ // if($datequery)
+ // $datequery2 = escape_tags(argv($x));
+ // else
+ // $datequery = escape_tags(argv($x));
+ // }
+ // }
+ // }
+ $datequery = ((x($_GET,'dend') && is_a_date_arg($_GET['dend'])) ? notags($_GET['dend']) : '');
+ $datequery2 = ((x($_GET,'dbegin') && is_a_date_arg($_GET['dbegin'])) ? notags($_GET['dbegin']) : '');
if(get_config('system','block_public') && (! get_account_id()) && (! remote_user())) {
return login();