Skip to content

Commit

Permalink
[#32118] Content-Type header is sent twice (Fix #2086)
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Babker committed Oct 5, 2013
1 parent a302316 commit f36bd96
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 157 deletions.
7 changes: 5 additions & 2 deletions installation/CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ $ -> Language fix or change
- -> Removed
! -> Note

05-Oct-2013 Michael Babker
# [#32118] Content-Type header is sent twice

05-Oct-2013 Elin Waring
# [#28348] Don't hard code IDs for update SQL menu items. Thanks Brian Teeman and Michael Babker
- [#31706] Locally hosted help screens are miles out of date. Thanks Tom Hutchison
Expand All @@ -50,13 +53,13 @@ $ -> Language fix or change
$ Updating installation lang files: ar-AA, de-DE, he-IL, it-IT, sw-KE, sy-IQ, th-TH

04-Oct-2013 Mark Dexter
# [#32154] Notice in editing banner client. Thanks Elin Waring.
# [#32154] Notice in editing banner client. Thanks Elin Waring.

04-Oct-2013 Jean-Marie Simonet
# [#31827] Installation doesn't work when installation is in the path. Thanks Nikolai Plath
$ Updating installation lang file fr-FR
# [#28234] Addition of notification in Media Manager regarding folder name for Create Folder. Thanks Achal Aggarwal
# [#28214] Menu Items Could be Saved without Menu Item Type. Thanks Khai Vu Din
# [#28214] Menu Items Could be Saved without Menu Item Type. Thanks Khai Vu Din
# [#28794] Redirect to homepage instead of 404 with SEF and URL rewrite enabled if no com_content on homepage.
# Reverting [#28794]

Expand Down
7 changes: 5 additions & 2 deletions libraries/joomla/document/document.php
Original file line number Diff line number Diff line change
Expand Up @@ -951,11 +951,14 @@ public function parse($params = array())
*/
public function render($cache = false, $params = array())
{
$app = JFactory::getApplication();

if ($mdate = $this->getModifiedDate())
{
JFactory::getApplication()->setHeader('Last-Modified', $mdate /* gmdate('D, d M Y H:i:s', time() + 900) . ' GMT' */);
$app->modifiedDate = $mdate;
}

JFactory::getApplication()->setHeader('Content-Type', $this->_mime . ($this->_charset ? '; charset=' . $this->_charset : ''));
$app->mimeType = $this->_mime;
$app->charSet = $this->_charset;
}
}
Loading

0 comments on commit f36bd96

Please sign in to comment.