aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-03-24 19:51:23 -0700
committerfriendica <info@friendica.com>2013-03-24 19:51:23 -0700
commit23cd14329dcdc5b732a64bd7ba21123f24dd5cfd (patch)
tree0350e10cd36ddc659e84973cf201ea6f3497bb5c
parent5e47a8a14afff69a25c04e9f079c151eaf483741 (diff)
downloadvolse-hubzilla-23cd14329dcdc5b732a64bd7ba21123f24dd5cfd.tar.gz
volse-hubzilla-23cd14329dcdc5b732a64bd7ba21123f24dd5cfd.tar.bz2
volse-hubzilla-23cd14329dcdc5b732a64bd7ba21123f24dd5cfd.zip
fix mod_display breakage.
-rw-r--r--mod/display.php11
-rw-r--r--version.inc2
2 files changed, 10 insertions, 3 deletions
diff --git a/mod/display.php b/mod/display.php
index b1d376c41..d5feb1f54 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -3,6 +3,8 @@
function display_content(&$a, $update = 0, $load = false) {
+ logger("mod-display: update = $update load = $load");
+
if(intval(get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
notice( t('Public access denied.') . EOL);
return;
@@ -20,8 +22,12 @@ function display_content(&$a, $update = 0, $load = false) {
if(argc() > 1 && argv(1) !== 'load')
$item_hash = argv(1);
- if($_REQUEST['mid'])
- $item_hash = $_REQUEST['mid'];
+
+ // This should actually be mid, but it needs to be changed in build_query.tpl and in all the
+ // pages which call it
+
+ if($_REQUEST['uri'])
+ $item_hash = $_REQUEST['uri'];
if(! $item_hash) {
@@ -143,6 +149,7 @@ function display_content(&$a, $update = 0, $load = false) {
}
+
$o .= conversation($a,$items,'display', $update, 'client');
return $o;
diff --git a/version.inc b/version.inc
index 52f9b3c03..c64b92487 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2013-03-23.261
+2013-03-24.262