harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/friendica/red into zpull

Browse Source
This commit is contained in:
friendica 2013-09-15 03:52:37 -07:00
commit 033a9f67e7
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mod/channel.php
View File

@ -64,17 +64,18 @@ function channel_content(&$a, $update = 0, $load = false) {
$category = $datequery = $datequery2 = ''; $category = $datequery = $datequery2 = '';
if(argc() > 2) { // if(argc() > 2) {
for($x = 2; $x < argc(); $x ++) { // for($x = 2; $x < argc(); $x ++) {
if(is_a_date_arg(argv($x))) { // if(is_a_date_arg(argv($x))) {
if($datequery) // if($datequery)
$datequery2 = escape_tags(argv($x)); // $datequery2 = escape_tags(argv($x));
else // else
$datequery = escape_tags(argv($x)); // $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())) { if(get_config('system','block_public') && (! get_account_id()) && (! remote_user())) {
return login(); return login();

2
view/tpl/posted_date_widget.tpl
View File

@ -3,7 +3,7 @@
<script>function dateSubmit(dateurl) { window.location.href = dateurl; } </script> <script>function dateSubmit(dateurl) { window.location.href = dateurl; } </script>
<select id="posted-date-selector" name="posted-date-select" onchange="dateSubmit($(this).val());" size="{{$size}}"> <select id="posted-date-selector" name="posted-date-select" onchange="dateSubmit($(this).val());" size="{{$size}}">
{{foreach $dates as $d}} {{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}} {{/foreach}}
</select> </select>
</div> </div>