[Joomla-commits] r22967 - in development/trunk/administrator: components/com_installer/views/update/tmpl includes

[githu...@jcode001.directrouter.com]

Author: github_bot
Date: 2012-04-02 08:56:28 -0500 (Mon, 02 Apr 2012)
New Revision: 22967

Modified:
development/trunk/administrator/components/com_installer/views/update/tmpl/default.php
development/trunk/administrator/includes/helper.php
Log:
Merge branch 'master' of github.com:joomla/joomla-cms

Modified: development/trunk/administrator/components/com_installer/views/update/tmpl/default.php
===================================================================
--- development/trunk/administrator/components/com_installer/views/update/tmpl/default.php 2012-03-31 22:16:27 UTC (rev 22966)
+++ development/trunk/administrator/components/com_installer/views/update/tmpl/default.php 2012-04-02 13:56:28 UTC (rev 22967)
@@ -51,8 +51,8 @@
<tr class="row<?php echo $i%2; ?>">
<td><?php echo JHtml::_('grid.id', $i, $item->update_id); ?></td>
<td>
- <span class="editlinktip hasTip" title="<?php echo JText::_('JGLOBAL_DESCRIPTION');?>::<?php echo $item->description ? $item->description : JText::_('COM_INSTALLER_MSG_UPDATE_NODESC'); ?>">
- <?php echo $item->name; ?>
+ <span class="editlinktip hasTip" title="<?php echo JText::_('JGLOBAL_DESCRIPTION');?>::<?php echo $item->description ? $this->escape($item->description) : JText::_('COM_INSTALLER_MSG_UPDATE_NODESC'); ?>">
+ <?php echo $this->escape($item->name); ?>
</span>
</td>
<td class="center">
@@ -64,7 +64,7 @@
<td class="center"><?php echo $client; ?></td>
<td><?php echo $item->detailsurl ?>
<?php if (isset($item->infourl)) : ?>
- <br /><a href="<?php echo $item->infourl;?>"><?php echo $item->infourl;?></a>
+ <br /><a href="<?php echo $item->infourl;?>"><?php echo $this->escape($item->infourl);?></a>
<?php endif; ?>
</td>
</tr>

Modified: development/trunk/administrator/includes/helper.php
===================================================================
--- development/trunk/administrator/includes/helper.php 2012-03-31 22:16:27 UTC (rev 22966)
+++ development/trunk/administrator/includes/helper.php 2012-04-02 13:56:28 UTC (rev 22967)
@@ -27,7 +27,7 @@
$option = strtolower(JRequest::getCmd('option'));

$user = JFactory::getUser();
- if ($user->get('guest')) {
+ if (!$user->authorise('core.login.admin')) {
$option = 'com_login';
}

_______________________________________________
Joomla-commits mailing list
Joomla-...@joomlacode.org
http://joomlacode.org/mailman/listinfo/joomla-commits