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

fix mod_display breakage.

Browse Source
This commit is contained in:
friendica 2013-03-24 19:51:23 -07:00
parent 5e47a8a14a
commit 23cd14329d
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mod/display.php
View File

@ -3,6 +3,8 @@
function display_content(&$a, $update = 0, $load = false) { 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())) { if(intval(get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
notice( t('Public access denied.') . EOL); notice( t('Public access denied.') . EOL);
return; return;
@ -20,8 +22,12 @@ function display_content(&$a, $update = 0, $load = false) {
if(argc() > 1 && argv(1) !== 'load') if(argc() > 1 && argv(1) !== 'load')
$item_hash = argv(1); $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) { if(! $item_hash) {
@ -143,6 +149,7 @@ function display_content(&$a, $update = 0, $load = false) {
} }
$o .= conversation($a,$items,'display', $update, 'client'); $o .= conversation($a,$items,'display', $update, 'client');
return $o; return $o;

2
version.inc
View File

@ -1 +1 @@
2013-03-23.261 2013-03-24.262