aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2019-04-28 17:47:26 -0700
committerzotlabs <mike@macgirvin.com>2019-04-28 17:47:26 -0700
commit95871fe13c3a9515d82510997a734bf7e8945bad (patch)
treee6974fb15bac5844220287c94755f203dc403829 /Zotlabs
parent9536a490b3fc5fc02a6d0a79275e8df03ee8156b (diff)
parent0cecfceb14083141da389b7cc1e413ba5d5ca6d7 (diff)
downloadvolse-hubzilla-95871fe13c3a9515d82510997a734bf7e8945bad.tar.gz
volse-hubzilla-95871fe13c3a9515d82510997a734bf7e8945bad.tar.bz2
volse-hubzilla-95871fe13c3a9515d82510997a734bf7e8945bad.zip
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Channel.php18
-rw-r--r--Zotlabs/Module/Photo.php3
2 files changed, 8 insertions, 13 deletions
diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php
index d4ef94e06..144c2472a 100644
--- a/Zotlabs/Module/Channel.php
+++ b/Zotlabs/Module/Channel.php
@@ -46,14 +46,14 @@ class Channel extends Controller {
$channel = App::get_channel();
if((local_channel()) && (argc() > 2) && (argv(2) === 'view')) {
- $which = $channel['channel_address'];
- $profile = argv(1);
- }
+ $which = $channel['channel_address'];
+ $profile = argv(1);
+ }
$channel = channelx_by_nick($which);
- if(! $channel) {
- http_status_exit(404, 'Not found');
- }
+ if(! $channel) {
+ http_status_exit(404, 'Not found');
+ }
// handle zot6 channel discovery
@@ -310,10 +310,6 @@ class Channel extends Controller {
$sql_extra2 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2))));
}
- if($datequery || $datequery2) {
- $sql_extra2 .= " and item.item_thread_top != 0 ";
- }
-
if($order === 'post')
$ordering = "created";
else
@@ -342,7 +338,7 @@ class Channel extends Controller {
AND (abook.abook_blocked = 0 or abook.abook_flags is null)
AND item.item_wall = 1 AND item.item_thread_top = 1
$sql_extra $sql_extra2
- ORDER BY $ordering DESC $pager_sql ",
+ ORDER BY $ordering DESC, item_id $pager_sql ",
intval(App::$profile['profile_uid'])
);
}
diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php
index 30670c329..0dc6d0194 100644
--- a/Zotlabs/Module/Photo.php
+++ b/Zotlabs/Module/Photo.php
@@ -173,8 +173,7 @@ class Photo extends \Zotlabs\Web\Controller {
// SSLify if needed
if(strpos(z_root(),'https:') !== false && strpos($url,'https:') === false)
$url = z_root() . '/sslify/' . $filename . '?f=&url=' . urlencode($url);
- header("Location: " . $url);
- killme();
+ goaway($url);
}
}
}