aboutsummaryrefslogtreecommitdiffstats
path: root/mod/chanview.php
diff options
context:
space:
mode:
authorRedMatrix <info@friendica.com>2014-09-02 12:28:30 +1000
committerRedMatrix <info@friendica.com>2014-09-02 12:28:30 +1000
commit43738da24f6025fba2cdd9d2a7400f6f18cb1ca3 (patch)
tree62acad999528a9dfe6152d4924ba24ed5e804f85 /mod/chanview.php
parentd507484cc52840e90fbe88568a56e61a183ef455 (diff)
parent6d7897a955319d7d83a558258936528d70501a89 (diff)
downloadvolse-hubzilla-43738da24f6025fba2cdd9d2a7400f6f18cb1ca3.tar.gz
volse-hubzilla-43738da24f6025fba2cdd9d2a7400f6f18cb1ca3.tar.bz2
volse-hubzilla-43738da24f6025fba2cdd9d2a7400f6f18cb1ca3.zip
Merge pull request #576 from beardy-unixer/master
Allow directories to stop being directories without killing anyone.
Diffstat (limited to 'mod/chanview.php')
-rw-r--r--mod/chanview.php14
1 files changed, 9 insertions, 5 deletions
diff --git a/mod/chanview.php b/mod/chanview.php
index 449a98bb1..3bf0f3268 100644
--- a/mod/chanview.php
+++ b/mod/chanview.php
@@ -74,15 +74,19 @@ function chanview_content(&$a) {
}
if(! $a->poi) {
- notice( t('Channel not found.') . EOL);
- return;
+// We don't know who this is, and we can't figure it out from the URL
+// On the plus side, there's a good chance we know somebody else at that
+// hub so sending them there with a Zid will probably work anyway.
+ $url = ($_REQUEST['url']);
+ if($observer)
+ $url = zid($url);
}
-
+ if ($a->poi) {
$url = $a->poi['xchan_url'];
if($observer)
$url = zid($url);
-
+ }
// let somebody over-ride the iframed viewport presentation
// or let's just declare this a failed experiment.
@@ -97,4 +101,4 @@ function chanview_content(&$a) {
// return $o;
-} \ No newline at end of file
+}