Permalink
Browse files

[#28303] Change 28026 so it doesn't modify platform files

  • Loading branch information...
1 parent 4dca060 commit c0cdf394c100003ca4b247b84c18fa4a066624e4 @realityking realityking committed with dextercowley Mar 29, 2012
View
1 administrator/includes/application.php
@@ -148,6 +148,7 @@ public function dispatch($component = null)
$document->setTitle($this->getCfg('sitename'). ' - ' .JText::_('JADMINISTRATION'));
$document->setDescription($this->getCfg('MetaDesc'));
+ $document->setGenerator('Joomla! - Open Source Content Management');
$contents = JComponentHelper::renderComponent($component);
$document->setBuffer($contents, 'component');
View
11 includes/application.php
@@ -184,6 +184,17 @@ public function dispatch($component = null)
$document->setTitle($params->get('page_title'));
$document->setDescription($params->get('page_description'));
+
+ // Add version number or not based on global configuration
+ if ($this->getCfg('MetaVersion', 0))
+ {
+ $document->setGenerator('Joomla! - Open Source Content Management - Version ' . JVERSION);
+ }
+ else
+ {
+ $document->setGenerator('Joomla! - Open Source Content Management');
+ }
+
$contents = JComponentHelper::renderComponent($component);
$document->setBuffer($contents, 'component');
View
3 installation/CHANGELOG
@@ -26,6 +26,9 @@ $ -> Language fix or change
- -> Removed
! -> Note
+28-Mar-2012 Mark Dexter
+ # [#28303] Change 28026 so it doesn't modify platform files
+
28-Mar-2012 Christophe Demko
# [#28314] #28299 can cause performance issue if root category is loaded in non multilanguage mode
# [#27961] Template is not displayed in the Styles (backend)
View
10 libraries/joomla/document/html/renderer/head.php
@@ -96,15 +96,7 @@ public function fetchHead(&$document)
$generator = $document->getGenerator();
if ($generator)
{
- // Add version number or not based on global configuration
- if (JFactory::getConfig()->get('MetaVersion', 0))
- {
- $buffer .= $tab . '<meta name="generator" content="' . htmlspecialchars($generator) . ' - Version ' . JVERSION . '" />' . $lnEnd;
- }
- else
- {
- $buffer .= $tab . '<meta name="generator" content="' . htmlspecialchars($generator) . '" />' . $lnEnd;
- }
+ $buffer .= $tab . '<meta name="generator" content="' . htmlspecialchars($generator) . '" />' . $lnEnd;
}
$buffer .= $tab . '<title>' . htmlspecialchars($document->getTitle(), ENT_COMPAT, 'UTF-8') . '</title>' . $lnEnd;

0 comments on commit c0cdf39

Please sign in to comment.