eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

PHP5.5 fix: Better use of startXML for Action classes (mostly AJAX)

Browse Source 
I had a problem with PHP5.5 that caused ajax responses to be empty. This
fixes it, as the problem was related to pretty inconsistent calling to
headers, XMLWriter::startDocument etc. etc.
This commit is contained in:
Mikael Nordfeldth
2013-09-24 01:17:04 +02:00
parent 1744fec89f
commit 1c6f9df80e
23 changed files with 50 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/Bookmark/actions/newbookmark.php
View File

@@ -150,9 +150,7 @@ class NewbookmarkAction extends Action
} catch (ClientException $ce) {
if ($this->boolean('ajax')) {
header('Content-Type: text/xml;charset=utf-8');
$this->xw->startDocument('1.0', 'UTF-8');
$this->elementStart('html');
$this->startHTML('text/xml;charset=utf-8');
$this->elementStart('head');
// TRANS: Page title after an AJAX error occurs
$this->element('title', null, _('Ajax Error'));
@@ -160,7 +158,7 @@ class NewbookmarkAction extends Action
$this->elementStart('body');
$this->element('p', array('id' => 'error'), $ce->getMessage());
$this->elementEnd('body');
$this->elementEnd('html');
$this->endHTML();
return;
} else {
$this->error = $ce->getMessage();
@@ -170,9 +168,7 @@ class NewbookmarkAction extends Action
}
if ($this->boolean('ajax')) {
header('Content-Type: text/xml;charset=utf-8');
$this->xw->startDocument('1.0', 'UTF-8');
$this->elementStart('html');
$this->startHTML('text/xml;charset=utf-8');
$this->elementStart('head');
// TRANS: Page title after posting a bookmark.
$this->element('title', null, _m('Bookmark posted'));
@@ -180,7 +176,7 @@ class NewbookmarkAction extends Action
$this->elementStart('body');
$this->showNotice($saved);
$this->elementEnd('body');
$this->elementEnd('html');
$this->endHTML();
} else {
common_redirect($saved->bestUrl(), 303);
}