--- a/web/lib/Zend/Feed.php Thu Mar 21 17:31:31 2013 +0100
+++ b/web/lib/Zend/Feed.php Thu Mar 21 19:50:53 2013 +0100
@@ -15,9 +15,9 @@
*
* @category Zend
* @package Zend_Feed
- * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
- * @version $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $
+ * @version $Id: Feed.php 25160 2012-12-18 15:17:16Z matthew $
*/
@@ -29,7 +29,7 @@
*
* @category Zend
* @package Zend_Feed
- * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Feed
@@ -191,7 +191,8 @@
public static function importString($string)
{
// Load the feed as an XML DOMDocument object
- $libxml_errflag = libxml_use_internal_errors(true);
+ $libxml_errflag = libxml_use_internal_errors(true);
+ $libxml_entity_loader = libxml_disable_entity_loader(true);
$doc = new DOMDocument;
if (trim($string) == '') {
require_once 'Zend/Feed/Exception.php';
@@ -199,9 +200,9 @@
. ' is an Empty string or comes from an empty HTTP response');
}
$status = $doc->loadXML($string);
+ libxml_disable_entity_loader($libxml_entity_loader);
libxml_use_internal_errors($libxml_errflag);
-
if (!$status) {
// prevent the class to generate an undefined variable notice (ZF-2590)
// Build error message