diff options
| author | friendica <info@friendica.com> | 2013-09-15 03:52:37 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-09-15 03:52:37 -0700 |
| commit | 033a9f67e7310e7ec1185b9a673abd9452600476 (patch) | |
| tree | 5d77e6743e5325a661d4faa0f79b3d0fd7a54be4 | |
| parent | 129a119c84d87bffe099cea7ac5b0ed511c26f80 (diff) | |
| parent | a7cd3f7dfe3fa82300401a217b298c78a438c39c (diff) | |
| download | volse-hubzilla-033a9f67e7310e7ec1185b9a673abd9452600476.tar.gz volse-hubzilla-033a9f67e7310e7ec1185b9a673abd9452600476.tar.bz2 volse-hubzilla-033a9f67e7310e7ec1185b9a673abd9452600476.zip | |
Merge https://github.com/friendica/red into zpull
| -rw-r--r-- | mod/channel.php | 23 | ||||
| -rwxr-xr-x | view/tpl/posted_date_widget.tpl | 2 |
2 files changed, 13 insertions, 12 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(); diff --git a/view/tpl/posted_date_widget.tpl b/view/tpl/posted_date_widget.tpl index 009fa60a6..6720d3628 100755 --- a/view/tpl/posted_date_widget.tpl +++ b/view/tpl/posted_date_widget.tpl @@ -3,7 +3,7 @@ <script>function dateSubmit(dateurl) { window.location.href = dateurl; } </script> <select id="posted-date-selector" name="posted-date-select" onchange="dateSubmit($(this).val());" size="{{$size}}"> {{foreach $dates as $d}} -<option value="{{$url}}/{{$d.1}}/{{$d.2}}" >{{$d.0}}</option> +<option value="{{$url}}?dend={{$d.1}}&dbegin={{$d.2}}" >{{$d.0}}</option> {{/foreach}} </select> </div> |