wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only serve tagprofile HTML if we aren't POSTing via ajax

Browse Source 
This fixes an issue where POSTing the selftag form in the
profile_block sidebar via AJAX would generate an XML response
containing both the content from doPost() and showPage(),
resulting in invalid XML.

These changes make it so that if we're POSTing via AJAX,
we serve content from doPost(), otherwise we serve showPage()
but never both.
This commit is contained in:
Chimo 2015-06-06 00:22:14 -04:00
parent 3294d704a4
commit 47c83f4c49
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
actions/tagprofile.php
View File

@ -65,6 +65,15 @@ class TagprofileAction extends FormAction
return sprintf(_m('ADDTOLIST','List %s'), $this->target->getNickname()); return sprintf(_m('ADDTOLIST','List %s'), $this->target->getNickname());
} }
function showPage()
{
// Only serve page content if we aren't POSTing via ajax
// otherwise, we serve XML content from doPost()
if (!$this->isPost() || !$this->boolean('ajax')) {
parent::showPage();
}
}
function showContent() function showContent()
{ {
$this->elementStart('div', 'entity_profile h-card'); $this->elementStart('div', 'entity_profile h-card');