Skip to content
Browse files

Revert " # [#29646] Some errors on Updater. Thanks Mark."

This reverts commit d1be1e5.
  • Loading branch information...
1 parent d1be1e5 commit f3662d61882ad3cfd1d3996b97c063996c1181ce @infograf768 infograf768 committed Nov 14, 2012
View
1 installation/CHANGELOG
@@ -30,7 +30,6 @@ $ -> Language fix or change
#$ [#29669] Consistent form validation notifications. Thanks Roland
# [#29675] *Protostar error page tries to load search module even when module is not published
$ [#29668] language installer coordinator team URL must changed j3 TT. Thanks Chalak
- # [#29646] Some errors on Updater. Thanks Mark.
11-Nov-2012 Jean-Marie Simonet
# [#29569] *Implementing accordeons for Modules Options
View
6 libraries/joomla/updater/adapters/collection.php
@@ -97,11 +97,7 @@ public function _startElement($parser, $name, $attrs = array())
$tag = $this->_getStackLocation();
// Reset the data
- if (isset($this->$tag))
- {
- $this->$tag->_data = "";
- }
-
+ eval('$this->' . $tag . '->_data = "";');
switch ($name)
{
case 'CATEGORY':
View
5 libraries/joomla/updater/adapters/extension.php
@@ -36,10 +36,7 @@ protected function _startElement($parser, $name, $attrs = array())
$tag = $this->_getStackLocation();
// Reset the data
- if (isset($this->$tag))
- {
- $this->$tag->_data = "";
- }
+ eval('$this->' . $tag . '->_data = "";');
switch ($name)
{
View
22 libraries/joomla/updater/update.php
@@ -180,10 +180,7 @@ public function _startElement($parser, $name, $attrs = array())
$tag = $this->_getStackLocation();
// Reset the data
- if (isset($this->$tag))
- {
- $this->$tag->_data = "";
- }
+ eval('$this->' . $tag . '->_data = "";');
switch ($name)
{
@@ -199,17 +196,10 @@ public function _startElement($parser, $name, $attrs = array())
// For everything else there's...the default!
default:
$name = strtolower($name);
- if (isset($this->currentUpdate->$name))
- {
- $this->currentUpdate->$name->_data = '';
- }
+ $this->currentUpdate->$name->_data = '';
foreach ($attrs as $key => $data)
{
$key = strtolower($key);
- if (!isset($this->currentUpdate->$name))
- {
- $this->currentUpdate->$name = new stdClass();
- }
$this->currentUpdate->$name->$key = $data;
}
break;
@@ -237,8 +227,7 @@ public function _endElement($parser, $name)
$ver = new JVersion;
$product = strtolower(JFilterInput::getInstance()->clean($ver->PRODUCT, 'cmd'));
// Check for optional min_dev_level and max_dev_level attributes to further specify targetplatform (e.g., 3.0.1)
- if (isset($this->currentUpdate->targetplatform->name)
- && $product == $this->currentUpdate->targetplatform->name
+ if ($product == $this->currentUpdate->targetplatform->name
&& preg_match('/' . $this->currentUpdate->targetplatform->version . '/', $ver->RELEASE)
&& ((!isset($this->currentUpdate->targetplatform->min_dev_level)) || $ver->DEV_LEVEL >= $this->currentUpdate->targetplatform->min_dev_level)
&& ((!isset($this->currentUpdate->targetplatform->max_dev_level)) || $ver->DEV_LEVEL <= $this->currentUpdate->targetplatform->max_dev_level))
@@ -296,10 +285,7 @@ public function _characterData($parser, $data)
// Throw the data for this item together
$tag = strtolower($tag);
- if (isset($this->currentUpdate->$tag))
- {
- $this->currentUpdate->$tag->_data .= $data;
- }
+ $this->currentUpdate->$tag->_data .= $data;
}
/**

0 comments on commit f3662d6

Please sign in to comment.
Something went wrong with that request. Please try again.