Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/3362' into develop
Browse files Browse the repository at this point in the history 
Forward port zendframework/zendframework#3362

Conflicts:
	library/Zend/Http/Client/Cookies.php
	library/Zend/Http/Cookies.php
	library/Zend/Soap/Client/Common.php
	library/Zend/Soap/Wsdl.php
  • Loading branch information
@weierophinney
weierophinney committed Jan 7, 2013
156 parents 15f9dd1 + 6c7650a + bea2340 + 53107b1 + e575de9 + c8a932b + d08629f + a04474f + 3fef53d + 1f4b9ed + d263f1c + c790aed + 412585a + b5e6b02 + 9ac81f3 + 9f28eab + 2e7e2e2 + 7c64770 + b82fa59 + 4190868 + 3a6b7ad + 8e745f6 + bab7086 + c5a5d19 + b468bc1 + d79794c + 508b344 + d16deed + f38e96a + c4a3687 + 54465f7 + 4ad15e4 + 9aa47da + 619d24d + ddfa8f2 + 8e7172b + e5fc69f + 284a721 + 6d3db4c + b99e8c3 + a52dcef + 1d21066 + cccc24c + 81bd699 + dfb38ed + b796f3d + d49dbc2 + 547433c + 0c9ce04 + a76e26a + 2914396 + 7ca3746 + f1b292d + 406112f + 5a9edd3 + f65c9f6 + c54156c + 5e55e82 + 352e42b + fa459f5 + 3eff137 + 3648ab6 + 4096125 + 0037391 + 9bdfcd9 + 6cd1498 + ecac99d + 199ed75 + b8507f7 + ef400bd + decb6ae + 860b39d + 243eca6 + d56af72 + 1aaf7f9 + 26b27a9 + 40cd50e + 986898b + d2780b7 + 49abb1d + cb5a738 + 21d3bef + 4748875 + 3331086 + bfed36c + b56e9b8 + 765b017 + b2cddce + 1c63803 + dd490e0 + c0425c2 + 128ed7f + 4d88940 + 94b3f1e + 9a0d8cf + 12135ad + 1169a58 + 6cdb5dc + 15950e5 + 7e68fb2 + 4bda4a9 + 537893f + 4cf10f8 + dd5b294 + 3ac5190 + 63d8503 + de5ff9e + f8868a0 + e3f8a27 + 634cf99 + c2cd236 + 189672f + d50054c + 8fb183a + 81a21d6 + ba78039 + 2cc9607 + bbd31f7 + aff5dfd + 3daad46 + a2bd1ba + cddc550 + eadb29a + 339c074 + 543ff20 + 732e048 + 8ec7eaf + 25fde7d + 5215c37 + a31404d + 1328e20 + 33a507b + 012928d + 379d601 + b7d4bbd + c1c633c + 50ab503 + 7961ef9 + bd800e4 + e677757 + a4c7b54 + ef5460e + 898d44f + c554ea2 + ffcf7bc + 2adc6bf + 4179b4d + c3f8fc7 + daf7b1d + b12454e + 3f39460 + bb17ed2 + 10d2ed9 + de6a155 + 2f039d3 + 697d6ba commit 0ee86d0
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions src/Reader/Entry/Rss.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,9 @@ public function getAuthors()
}

$authors = array();
$authors_dc = $this->getExtension('DublinCore')->getAuthors();
if (!empty($authors_dc)) {
foreach ($authors_dc as $author) {
$authorsDc = $this->getExtension('DublinCore')->getAuthors();
if (!empty($authorsDc)) {
foreach ($authorsDc as $author) {
$authors[] = array(
'name' => $author['name']
);
Expand Down
6 changes: 3 additions & 3 deletions src/Reader/Feed/Rss.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ public function getAuthors()
}

$authors = array();
$authors_dc = $this->getExtension('DublinCore')->getAuthors();
if (!empty($authors_dc)) {
foreach ($authors_dc as $author) {
$authorsDc = $this->getExtension('DublinCore')->getAuthors();
if (!empty($authorsDc)) {
foreach ($authorsDc as $author) {
$authors[] = array(
'name' => $author['name']
);
Expand Down
16 changes: 8 additions & 8 deletions src/Reader/Reader.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ public static function import($uri, $etag = null, $lastModified = null)
*/
public static function importString($string)
{
$libxml_errflag = libxml_use_internal_errors(true);
$libxmlErrflag = libxml_use_internal_errors(true);
$oldValue = libxml_disable_entity_loader(true);
$dom = new DOMDocument;
$status = $dom->loadXML(trim($string));
Expand All @@ -281,7 +281,7 @@ public static function importString($string)
}
}
libxml_disable_entity_loader($oldValue);
libxml_use_internal_errors($libxml_errflag);
libxml_use_internal_errors($libxmlErrflag);

if (!$status) {
// Build error message
Expand Down Expand Up @@ -346,12 +346,12 @@ public static function findFeedLinks($uri)
throw new Exception\RuntimeException("Failed to access $uri, got response code " . $response->getStatusCode());
}
$responseHtml = $response->getBody();
$libxml_errflag = libxml_use_internal_errors(true);
$libxmlErrflag = libxml_use_internal_errors(true);
$oldValue = libxml_disable_entity_loader(true);
$dom = new DOMDocument;
$status = $dom->loadHTML(trim($responseHtml));
libxml_disable_entity_loader($oldValue);
libxml_use_internal_errors($libxml_errflag);
libxml_use_internal_errors($libxmlErrflag);
if (!$status) {
// Build error message
$error = libxml_get_last_error();
Expand Down Expand Up @@ -401,14 +401,14 @@ public static function detectType($feed, $specOnly = false)
ini_restore('track_errors');
ErrorHandler::stop();
if (!$status) {
if (!isset($php_errormsg)) {
if (!isset($phpErrormsg)) {
if (function_exists('xdebug_is_enabled')) {
$php_errormsg = '(error message not available, when XDebug is running)';
$phpErrormsg = '(error message not available, when XDebug is running)';
} else {
$php_errormsg = '(error message not available)';
$phpErrormsg = '(error message not available)';
}
}
throw new Exception\RuntimeException("DOMDocument cannot parse XML: $php_errormsg");
throw new Exception\RuntimeException("DOMDocument cannot parse XML: $phpErrormsg");
}
} else {
throw new Exception\InvalidArgumentException('Invalid object/scalar provided: must'
Expand Down

0 comments on commit 0ee86d0

Please sign in to comment.