[Joomla-commits] r22943 - in development/trunk: administrator/components/com_installer/models/fields installation

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

Author: github_bot
Date: 2012-03-22 13:16:11 -0500 (Thu, 22 Mar 2012)
New Revision: 22943

Modified:
development/trunk/administrator/components/com_installer/models/fields/group.php
development/trunk/administrator/components/com_installer/models/fields/type.php
development/trunk/installation/CHANGELOG
Log:
Merge branch 'master' of github.com:joomla/joomla-cms

Modified: development/trunk/administrator/components/com_installer/models/fields/group.php
===================================================================
--- development/trunk/administrator/components/com_installer/models/fields/group.php 2012-03-22 18:06:14 UTC (rev 22942)
+++ development/trunk/administrator/components/com_installer/models/fields/group.php 2012-03-22 18:16:11 UTC (rev 22943)
@@ -37,7 +37,7 @@
$options = array();

foreach ($this->element->children() as $option) {
- $options[] = JHtml::_('select.option', (string)$option->attributes()->value, JText::_(trim($option->data())));
+ $options[] = JHtml::_('select.option', (string)$option->attributes()->value, JText::_(trim((string) $option)));
}

$dbo = JFactory::getDbo();

Modified: development/trunk/administrator/components/com_installer/models/fields/type.php
===================================================================
--- development/trunk/administrator/components/com_installer/models/fields/type.php 2012-03-22 18:06:14 UTC (rev 22942)
+++ development/trunk/administrator/components/com_installer/models/fields/type.php 2012-03-22 18:16:11 UTC (rev 22943)
@@ -36,7 +36,7 @@
$onchange = $this->element['onchange'] ? ' onchange="'.(string) $this->element['onchange'].'"' : '';
$options = array();
foreach ($this->element->children() as $option) {
- $options[] = JHtml::_('select.option', $option->attributes('value'), JText::_(trim($option->data())));
+ $options[] = JHtml::_('select.option', $option->attributes('value'), JText::_(trim((string) $option)));
}

$db = JFactory::getDBO();

Modified: development/trunk/installation/CHANGELOG
===================================================================
--- development/trunk/installation/CHANGELOG 2012-03-22 18:06:14 UTC (rev 22942)
+++ development/trunk/installation/CHANGELOG 2012-03-22 18:16:11 UTC (rev 22943)
@@ -31,6 +31,7 @@
# [#28280] Regression in the com_installer warnings. Thanks Rouven
# [#28154] RSS feed of com_finder throws fatal error. Thanks Elijah.
# [#28266] Sql error generated in menus. Thanks Sudhi
+ # [#28265] Fix use of deprecated API in com_installer. Thanks Rouven

21-Mar-2012 Jean-Marie Simonet
$ Updating installation ini files af-ZA, ar-AA, az-AZ, bg-BG, hr-HR, ro-RO

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