--- a/web/lib/Zend/Feed/Reader/EntryAbstract.php Sun Apr 21 10:07:03 2013 +0200
+++ b/web/lib/Zend/Feed/Reader/EntryAbstract.php Sun Apr 21 21:54:24 2013 +0200
@@ -14,15 +14,15 @@
*
* @category Zend
* @package Zend_Feed_Reader
- * @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: EntryAbstract.php 20096 2010-01-06 02:05:09Z bkarwin $
+ * @version $Id: EntryAbstract.php 25275 2013-03-06 09:55:33Z frosch $
*/
/**
* @category Zend
* @package Zend_Feed_Reader
- * @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
*/
abstract class Zend_Feed_Reader_EntryAbstract
@@ -72,9 +72,9 @@
/**
* Constructor
*
- * @param DOMElement $entry
- * @param int $entryKey
- * @param string $type
+ * @param DOMElement $entry
+ * @param int $entryKey
+ * @param string|null $type
* @return void
*/
public function __construct(DOMElement $entry, $entryKey, $type = null)
@@ -85,7 +85,9 @@
if ($type !== null) {
$this->_data['type'] = $type;
} else {
- $this->_data['type'] = Zend_Feed_Reader::detectType($feed);
+ $this->_data['type'] = Zend_Feed_Reader::detectType(
+ $this->_domDocument
+ );
}
$this->_loadExtensions();
}
@@ -212,8 +214,10 @@
}
}
require_once 'Zend/Feed/Exception.php';
- throw new Zend_Feed_Exception('Method: ' . $method
- . 'does not exist and could not be located on a registered Extension');
+ throw new Zend_Feed_Exception(
+ 'Method: ' . $method
+ . 'does not exist and could not be located on a registered Extension'
+ );
}
/**