Merge branch '2.0' of github.com:cakephp/cakephp into 2.0

This commit is contained in:
mark_story 2010-10-24 20:58:58 -04:00
commit f61e8b48b6

View file

@ -175,13 +175,15 @@ class RequestHandlerComponent extends Component {
if (!class_exists('Xml')) {
App::import('Core', 'Xml');
}
$xml = Xml::build(trim(file_get_contents('php://input')));
try {
$xml = Xml::build(trim(file_get_contents('php://input')));
if (isset($xml->data)) {
$controller->data = Xml::toArray($xml->data);
} else {
$controller->data = Xml::toArray($xml);
}
if (isset($xml->data)) {
$controller->data = Xml::toArray($xml->data);
} else {
$controller->data = Xml::toArray($xml);
}
} catch (Exception $e) {}
}
}