diff --git a/inc/SimplePie.php b/inc/SimplePie.php
index 1c97e2384710de90bce8d456c8655f949a2b47c5..276a654ee2cf62b173147a1fc0ea04d9ef71b7ae 100644
--- a/inc/SimplePie.php
+++ b/inc/SimplePie.php
@@ -648,7 +648,7 @@ class SimplePie
function SimplePie($feed_url = null, $cache_location = null, $cache_duration = null)
{
// Other objects, instances created here so we can set options on them
- $this->sanitize =& new SimplePie_Sanitize;
+ $this->sanitize = new SimplePie_Sanitize;
// Set options if they're passed to the constructor
if ($cache_location !== null)
@@ -979,7 +979,7 @@ class SimplePie
{
if (SimplePie_Misc::is_subclass_of($class, 'SimplePie_Sanitize'))
{
- $this->sanitize =& new $class;
+ $this->sanitize = new $class;
return true;
}
return false;
@@ -1383,7 +1383,7 @@ function embed_wmedia(width, height, link) {
// Decide whether to enable caching
if ($this->cache && $parsed_feed_url['scheme'] !== '')
{
- $cache =& new $this->cache_class($this->cache_location, call_user_func($this->cache_name_function, $this->feed_url), 'spc');
+ $cache = new $this->cache_class($this->cache_location, call_user_func($this->cache_name_function, $this->feed_url), 'spc');
}
// If it's enabled and we don't want an XML dump, use the cache
if ($cache && !$this->xml_dump)
@@ -1438,7 +1438,7 @@ function embed_wmedia(width, height, link) {
{
$headers['if-none-match'] = $this->data['headers']['etag'];
}
- $file =& new $this->file_class($this->feed_url, $this->timeout/10, 5, $headers, $this->useragent, $this->force_fsockopen);
+ $file = new $this->file_class($this->feed_url, $this->timeout/10, 5, $headers, $this->useragent, $this->force_fsockopen);
if ($file->success)
{
if ($file->status_code == 304)
@@ -1479,7 +1479,7 @@ function embed_wmedia(width, height, link) {
}
else
{
- $file =& new $this->file_class($this->feed_url, $this->timeout, 5, null, $this->useragent, $this->force_fsockopen);
+ $file = new $this->file_class($this->feed_url, $this->timeout, 5, null, $this->useragent, $this->force_fsockopen);
}
}
// If the file connection has an error, set SimplePie::error to that and quit
@@ -1497,7 +1497,7 @@ function embed_wmedia(width, height, link) {
}
// Check if the supplied URL is a feed, if it isn't, look for it.
- $locate =& new $this->locator_class($file, $this->timeout, $this->useragent, $this->file_class, $this->max_checked_feeds);
+ $locate = new $this->locator_class($file, $this->timeout, $this->useragent, $this->file_class, $this->max_checked_feeds);
if (!$locate->is_feed($file))
{
// We need to unset this so that if SimplePie::set_file() has been called that object is untouched
@@ -1510,7 +1510,7 @@ function embed_wmedia(width, height, link) {
{
trigger_error("$cache->name is not writeable", E_USER_WARNING);
}
- $cache =& new $this->cache_class($this->cache_location, call_user_func($this->cache_name_function, $file->url), 'spc');
+ $cache = new $this->cache_class($this->cache_location, call_user_func($this->cache_name_function, $file->url), 'spc');
}
$this->feed_url = $file->url;
}
@@ -1595,7 +1595,7 @@ function embed_wmedia(width, height, link) {
// Strip illegal characters
$data = SimplePie_Misc::utf8_bad_replace($data);
- $parser =& new $this->parser_class();
+ $parser = new $this->parser_class();
$parser->pre_process($data, 'UTF-8');
// If we want the XML, just output that and quit
if ($this->xml_dump)
@@ -1798,7 +1798,7 @@ function embed_wmedia(width, height, link) {
if ($this->cache && $this->favicon_handler)
{
- $cache =& new $this->cache_class($this->cache_location, call_user_func($this->cache_name_function, $favicon), 'spi');
+ $cache = new $this->cache_class($this->cache_location, call_user_func($this->cache_name_function, $favicon), 'spi');
if ($cache->load())
{
@@ -1806,7 +1806,7 @@ function embed_wmedia(width, height, link) {
}
else
{
- $file =& new $this->file_class($favicon, $this->timeout / 10, 5, array('X-FORWARDED-FOR' => $_SERVER['REMOTE_ADDR']), $this->useragent, $this->force_fsockopen);
+ $file = new $this->file_class($favicon, $this->timeout / 10, 5, array('X-FORWARDED-FOR' => $_SERVER['REMOTE_ADDR']), $this->useragent, $this->force_fsockopen);
if ($file->success && ($file->status_code == 200 || ($file->status_code > 206 && $file->status_code < 300)) && strlen($file->body) > 0)
{
@@ -2556,7 +2556,7 @@ function embed_wmedia(width, height, link) {
$keys = array_keys($items);
foreach ($keys as $key)
{
- $this->data['items'][] =& new $this->item_class($this, $items[$key]);
+ $this->data['items'][] = new $this->item_class($this, $items[$key]);
}
}
if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'entry'))
@@ -2564,7 +2564,7 @@ function embed_wmedia(width, height, link) {
$keys = array_keys($items);
foreach ($keys as $key)
{
- $this->data['items'][] =& new $this->item_class($this, $items[$key]);
+ $this->data['items'][] = new $this->item_class($this, $items[$key]);
}
}
if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'item'))
@@ -2572,7 +2572,7 @@ function embed_wmedia(width, height, link) {
$keys = array_keys($items);
foreach ($keys as $key)
{
- $this->data['items'][] =& new $this->item_class($this, $items[$key]);
+ $this->data['items'][] = new $this->item_class($this, $items[$key]);
}
}
if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'item'))
@@ -2580,7 +2580,7 @@ function embed_wmedia(width, height, link) {
$keys = array_keys($items);
foreach ($keys as $key)
{
- $this->data['items'][] =& new $this->item_class($this, $items[$key]);
+ $this->data['items'][] = new $this->item_class($this, $items[$key]);
}
}
if ($items = $this->get_channel_tags('', 'item'))
@@ -2588,7 +2588,7 @@ function embed_wmedia(width, height, link) {
$keys = array_keys($items);
foreach ($keys as $key)
{
- $this->data['items'][] =& new $this->item_class($this, $items[$key]);
+ $this->data['items'][] = new $this->item_class($this, $items[$key]);
}
}
}
@@ -2914,19 +2914,19 @@ class SimplePie_Item
{
$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
}
- $categories[] =& new $this->feed->category_class($term, $scheme, $label);
+ $categories[] = new $this->feed->category_class($term, $scheme, $label);
}
foreach ((array) $this->get_item_tags('', 'category') as $category)
{
- $categories[] =& new $this->feed->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
+ $categories[] = new $this->feed->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
}
foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'subject') as $category)
{
- $categories[] =& new $this->feed->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
+ $categories[] = new $this->feed->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
}
foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'subject') as $category)
{
- $categories[] =& new $this->feed->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
+ $categories[] = new $this->feed->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
}
if (!empty($categories))
@@ -2977,7 +2977,7 @@ class SimplePie_Item
}
if ($name !== null || $email !== null || $uri !== null)
{
- $authors[] =& new $this->feed->author_class($name, $uri, $email);
+ $authors[] = new $this->feed->author_class($name, $uri, $email);
}
}
if ($author = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'author'))
@@ -2999,24 +2999,24 @@ class SimplePie_Item
}
if ($name !== null || $email !== null || $uri !== null)
{
- $authors[] =& new $this->feed->author_class($name, $url, $email);
+ $authors[] = new $this->feed->author_class($name, $url, $email);
}
}
if ($author = $this->get_item_tags('', 'author'))
{
- $authors[] =& new $this->feed->author_class(null, null, $this->sanitize($author[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
+ $authors[] = new $this->feed->author_class(null, null, $this->sanitize($author[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
}
foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'creator') as $author)
{
- $authors[] =& new $this->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
+ $authors[] = new $this->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
}
foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'creator') as $author)
{
- $authors[] =& new $this->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
+ $authors[] = new $this->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
}
foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'author') as $author)
{
- $authors[] =& new $this->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
+ $authors[] = new $this->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
}
if (!empty($authors))
@@ -3298,7 +3298,7 @@ class SimplePie_Item
{
$caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT);
}
- $captions_parent[] =& new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);
+ $captions_parent[] = new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);
}
}
elseif ($captions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'text'))
@@ -3330,7 +3330,7 @@ class SimplePie_Item
{
$caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT);
}
- $captions_parent[] =& new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);
+ $captions_parent[] = new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);
}
}
if (is_array($captions_parent))
@@ -3360,7 +3360,7 @@ class SimplePie_Item
{
$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
}
- $categories_parent[] =& new $this->feed->category_class($term, $scheme, $label);
+ $categories_parent[] = new $this->feed->category_class($term, $scheme, $label);
}
foreach ((array) $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'category') as $category)
{
@@ -3383,7 +3383,7 @@ class SimplePie_Item
{
$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
}
- $categories_parent[] =& new $this->feed->category_class($term, $scheme, $label);
+ $categories_parent[] = new $this->feed->category_class($term, $scheme, $label);
}
foreach ((array) $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'category') as $category)
{
@@ -3394,7 +3394,7 @@ class SimplePie_Item
{
$label = $this->sanitize($category['attribs']['']['text'], SIMPLEPIE_CONSTRUCT_TEXT);
}
- $categories_parent[] =& new $this->feed->category_class($term, $scheme, $label);
+ $categories_parent[] = new $this->feed->category_class($term, $scheme, $label);
if (isset($category['child'][SIMPLEPIE_NAMESPACE_ITUNES]['category']))
{
@@ -3404,7 +3404,7 @@ class SimplePie_Item
{
$label = $this->sanitize($subcategory['attribs']['']['text'], SIMPLEPIE_CONSTRUCT_TEXT);
}
- $categories_parent[] =& new $this->feed->category_class($term, $scheme, $label);
+ $categories_parent[] = new $this->feed->category_class($term, $scheme, $label);
}
}
}
@@ -3426,7 +3426,7 @@ class SimplePie_Item
{
$copyright_label = $this->sanitize($copyright[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
}
- $copyrights_parent =& new $this->feed->copyright_class($copyright_url, $copyright_label);
+ $copyrights_parent = new $this->feed->copyright_class($copyright_url, $copyright_label);
}
elseif ($copyright = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'copyright'))
{
@@ -3440,7 +3440,7 @@ class SimplePie_Item
{
$copyright_label = $this->sanitize($copyright[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
}
- $copyrights_parent =& new $this->feed->copyright_class($copyright_url, $copyright_label);
+ $copyrights_parent = new $this->feed->copyright_class($copyright_url, $copyright_label);
}
// CREDITS
@@ -3467,7 +3467,7 @@ class SimplePie_Item
{
$credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT);
}
- $credits_parent[] =& new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);
+ $credits_parent[] = new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);
}
}
elseif ($credits = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'credit'))
@@ -3493,7 +3493,7 @@ class SimplePie_Item
{
$credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT);
}
- $credits_parent[] =& new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);
+ $credits_parent[] = new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);
}
}
if (is_array($credits_parent))
@@ -3682,7 +3682,7 @@ class SimplePie_Item
{
$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
}
- $ratings_parent[] =& new $this->feed->rating_class($rating_scheme, $rating_value);
+ $ratings_parent[] = new $this->feed->rating_class($rating_scheme, $rating_value);
}
}
elseif ($ratings = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'explicit'))
@@ -3695,7 +3695,7 @@ class SimplePie_Item
{
$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
}
- $ratings_parent[] =& new $this->feed->rating_class($rating_scheme, $rating_value);
+ $ratings_parent[] = new $this->feed->rating_class($rating_scheme, $rating_value);
}
}
elseif ($ratings = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'rating'))
@@ -3716,7 +3716,7 @@ class SimplePie_Item
{
$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
}
- $ratings_parent[] =& new $this->feed->rating_class($rating_scheme, $rating_value);
+ $ratings_parent[] = new $this->feed->rating_class($rating_scheme, $rating_value);
}
}
elseif ($ratings = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'explicit'))
@@ -3729,7 +3729,7 @@ class SimplePie_Item
{
$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
}
- $ratings_parent[] =& new $this->feed->rating_class($rating_scheme, $rating_value);
+ $ratings_parent[] = new $this->feed->rating_class($rating_scheme, $rating_value);
}
}
if (is_array($ratings_parent))
@@ -3757,7 +3757,7 @@ class SimplePie_Item
{
$restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT);
}
- $restrictions_parent[] =& new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
+ $restrictions_parent[] = new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
}
}
elseif ($restrictions = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'block'))
@@ -3771,7 +3771,7 @@ class SimplePie_Item
{
$restriction_relationship = 'deny';
}
- $restrictions_parent[] =& new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
+ $restrictions_parent[] = new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
}
}
elseif ($restrictions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'restriction'))
@@ -3793,7 +3793,7 @@ class SimplePie_Item
{
$restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT);
}
- $restrictions_parent[] =& new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
+ $restrictions_parent[] = new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
}
}
elseif ($restrictions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'block'))
@@ -3807,7 +3807,7 @@ class SimplePie_Item
{
$restriction_relationship = 'deny';
}
- $restrictions_parent[] =& new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
+ $restrictions_parent[] = new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
}
}
if (is_array($restrictions_parent))
@@ -3981,7 +3981,7 @@ class SimplePie_Item
{
$caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT);
}
- $captions[] =& new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);
+ $captions[] = new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);
}
if (is_array($captions))
{
@@ -4017,7 +4017,7 @@ class SimplePie_Item
{
$caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT);
}
- $captions[] =& new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);
+ $captions[] = new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);
}
if (is_array($captions))
{
@@ -4053,7 +4053,7 @@ class SimplePie_Item
{
$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
}
- $categories[] =& new $this->feed->category_class($term, $scheme, $label);
+ $categories[] = new $this->feed->category_class($term, $scheme, $label);
}
}
if (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['category']))
@@ -4079,7 +4079,7 @@ class SimplePie_Item
{
$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
}
- $categories[] =& new $this->feed->category_class($term, $scheme, $label);
+ $categories[] = new $this->feed->category_class($term, $scheme, $label);
}
}
if (is_array($categories) && is_array($categories_parent))
@@ -4108,7 +4108,7 @@ class SimplePie_Item
{
$copyright_label = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
}
- $copyrights =& new $this->feed->copyright_class($copyright_url, $copyright_label);
+ $copyrights = new $this->feed->copyright_class($copyright_url, $copyright_label);
}
elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright']))
{
@@ -4122,7 +4122,7 @@ class SimplePie_Item
{
$copyright_label = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
}
- $copyrights =& new $this->feed->copyright_class($copyright_url, $copyright_label);
+ $copyrights = new $this->feed->copyright_class($copyright_url, $copyright_label);
}
else
{
@@ -4153,7 +4153,7 @@ class SimplePie_Item
{
$credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT);
}
- $credits[] =& new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);
+ $credits[] = new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);
}
if (is_array($credits))
{
@@ -4183,7 +4183,7 @@ class SimplePie_Item
{
$credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT);
}
- $credits[] =& new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);
+ $credits[] = new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);
}
if (is_array($credits))
{
@@ -4336,7 +4336,7 @@ class SimplePie_Item
{
$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
}
- $ratings[] =& new $this->feed->rating_class($rating_scheme, $rating_value);
+ $ratings[] = new $this->feed->rating_class($rating_scheme, $rating_value);
}
if (is_array($ratings))
{
@@ -4361,7 +4361,7 @@ class SimplePie_Item
{
$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
}
- $ratings[] =& new $this->feed->rating_class($rating_scheme, $rating_value);
+ $ratings[] = new $this->feed->rating_class($rating_scheme, $rating_value);
}
if (is_array($ratings))
{
@@ -4393,7 +4393,7 @@ class SimplePie_Item
{
$restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT);
}
- $restrictions[] =& new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
+ $restrictions[] = new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
}
if (is_array($restrictions))
{
@@ -4419,7 +4419,7 @@ class SimplePie_Item
{
$restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT);
}
- $restrictions[] =& new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
+ $restrictions[] = new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
}
if (is_array($restrictions))
{
@@ -4473,7 +4473,7 @@ class SimplePie_Item
$title = $title_parent;
}
- $this->data['enclosures'][] =& new $this->feed->enclosure_class($url, $type, $length, $this->feed->javascript, $bitrate, $captions, $categories, $channels, $copyrights, $credits, $description, $duration, $expression, $framerate, $hashes, $height, $keywords, $lang, $medium, $player, $ratings, $restrictions, $samplingrate, $thumbnails, $title, $width);
+ $this->data['enclosures'][] = new $this->feed->enclosure_class($url, $type, $length, $this->feed->javascript, $bitrate, $captions, $categories, $channels, $copyrights, $credits, $description, $duration, $expression, $framerate, $hashes, $height, $keywords, $lang, $medium, $player, $ratings, $restrictions, $samplingrate, $thumbnails, $title, $width);
}
}
}
@@ -4602,7 +4602,7 @@ class SimplePie_Item
{
$caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT);
}
- $captions[] =& new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);
+ $captions[] = new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);
}
if (is_array($captions))
{
@@ -4638,7 +4638,7 @@ class SimplePie_Item
{
$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
}
- $categories[] =& new $this->feed->category_class($term, $scheme, $label);
+ $categories[] = new $this->feed->category_class($term, $scheme, $label);
}
}
if (is_array($categories) && is_array($categories_parent))
@@ -4671,7 +4671,7 @@ class SimplePie_Item
{
$copyright_label = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
}
- $copyrights =& new $this->feed->copyright_class($copyright_url, $copyright_label);
+ $copyrights = new $this->feed->copyright_class($copyright_url, $copyright_label);
}
else
{
@@ -4702,7 +4702,7 @@ class SimplePie_Item
{
$credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT);
}
- $credits[] =& new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);
+ $credits[] = new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);
}
if (is_array($credits))
{
@@ -4806,7 +4806,7 @@ class SimplePie_Item
{
$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
}
- $ratings[] =& new $this->feed->rating_class($rating_scheme, $rating_value);
+ $ratings[] = new $this->feed->rating_class($rating_scheme, $rating_value);
}
if (is_array($ratings))
{
@@ -4838,7 +4838,7 @@ class SimplePie_Item
{
$restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT);
}
- $restrictions[] =& new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
+ $restrictions[] = new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
}
if (is_array($restrictions))
{
@@ -4877,7 +4877,7 @@ class SimplePie_Item
$title = $title_parent;
}
- $this->data['enclosures'][] =& new $this->feed->enclosure_class($url, $type, $length, $this->feed->javascript, $bitrate, $captions, $categories, $channels, $copyrights, $credits, $description, $duration, $expression, $framerate, $hashes, $height, $keywords, $lang, $medium, $player, $ratings, $restrictions, $samplingrate, $thumbnails, $title, $width);
+ $this->data['enclosures'][] = new $this->feed->enclosure_class($url, $type, $length, $this->feed->javascript, $bitrate, $captions, $categories, $channels, $copyrights, $credits, $description, $duration, $expression, $framerate, $hashes, $height, $keywords, $lang, $medium, $player, $ratings, $restrictions, $samplingrate, $thumbnails, $title, $width);
}
}
}
@@ -4913,7 +4913,7 @@ class SimplePie_Item
}
// Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor
- $this->data['enclosures'][] =& new $this->feed->enclosure_class($url, $type, $length, $this->feed->javascript, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title_parent, $width);
+ $this->data['enclosures'][] = new $this->feed->enclosure_class($url, $type, $length, $this->feed->javascript, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title_parent, $width);
}
}
@@ -4948,7 +4948,7 @@ class SimplePie_Item
}
// Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor
- $this->data['enclosures'][] =& new $this->feed->enclosure_class($url, $type, $length, $this->feed->javascript, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title_parent, $width);
+ $this->data['enclosures'][] = new $this->feed->enclosure_class($url, $type, $length, $this->feed->javascript, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title_parent, $width);
}
}
@@ -4983,7 +4983,7 @@ class SimplePie_Item
}
// Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor
- $this->data['enclosures'][] =& new $this->feed->enclosure_class($url, $type, $length, $this->feed->javascript, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title_parent, $width);
+ $this->data['enclosures'][] = new $this->feed->enclosure_class($url, $type, $length, $this->feed->javascript, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title_parent, $width);
}
}
$this->data['enclosures'] = array_values(SimplePie_Misc::array_unique($this->data['enclosures']));
@@ -5306,7 +5306,7 @@ class SimplePie_Enclosure
$this->width = $width;
if (class_exists('idna_convert'))
{
- $idn =& new idna_convert;
+ $idn = new idna_convert;
$parsed = SimplePie_Misc::parse_url($link);
$this->link = SimplePie_Misc::compress_parse_url($parsed['scheme'], $idn->encode($parsed['authority']), $parsed['path'], $parsed['query'], $parsed['fragment']);
}
@@ -6502,7 +6502,7 @@ class SimplePie_File
{
if (class_exists('idna_convert'))
{
- $idn =& new idna_convert;
+ $idn = new idna_convert;
$parsed = SimplePie_Misc::parse_url($url);
$url = SimplePie_Misc::compress_parse_url($parsed['scheme'], $idn->encode($parsed['authority']), $parsed['path'], $parsed['query'], $parsed['fragment']);
}
@@ -6563,7 +6563,7 @@ class SimplePie_File
curl_close($fp);
$this->headers = explode("\r\n\r\n", $this->headers, $info['redirect_count'] + 1);
$this->headers = array_pop($this->headers);
- $parser =& new SimplePie_HTTP_Parser($this->headers);
+ $parser = new SimplePie_HTTP_Parser($this->headers);
if ($parser->parse())
{
$this->headers = $parser->headers;
@@ -6672,7 +6672,7 @@ class SimplePie_File
}
if (!$info['timed_out'])
{
- $parser =& new SimplePie_HTTP_Parser($this->headers);
+ $parser = new SimplePie_HTTP_Parser($this->headers);
if ($parser->parse())
{
$this->headers = $parser->headers;
@@ -7548,7 +7548,7 @@ class SimplePie_Misc
*/
function display_cached_file($identifier_url, $cache_location = './cache', $cache_extension = 'spc', $cache_class = 'SimplePie_Cache', $cache_name_function = 'md5')
{
- $cache =& new $cache_class($cache_location, call_user_func($cache_name_function, $identifier_url), $cache_extension);
+ $cache = new $cache_class($cache_location, call_user_func($cache_name_function, $identifier_url), $cache_extension);
if ($file = $cache->load())
{
@@ -10116,7 +10116,7 @@ class SimplePie_Locator
if (!in_array($href, $done) && in_array('feed', $rel) || (in_array('alternate', $rel) && !empty($link['attribs']['type']['data']) && in_array(strtolower(SimplePie_Misc::parse_mime($link['attribs']['type']['data'])), array('application/rss+xml', 'application/atom+xml'))))
{
$this->checked_feeds++;
- $feed =& new $this->file_class($href, $this->timeout, 5, null, $this->useragent);
+ $feed = new $this->file_class($href, $this->timeout, 5, null, $this->useragent);
if ($this->is_feed($feed))
{
return $feed;
@@ -10181,7 +10181,7 @@ class SimplePie_Locator
if (in_array(strtolower(strrchr($value, '.')), array('.rss', '.rdf', '.atom', '.xml')))
{
$this->checked_feeds++;
- $feed =& new $this->file_class($value, $this->timeout, 5, null, $this->useragent);
+ $feed = new $this->file_class($value, $this->timeout, 5, null, $this->useragent);
if ($this->is_feed($feed))
{
return $feed;
@@ -10206,7 +10206,7 @@ class SimplePie_Locator
if (preg_match('/(rss|rdf|atom|xml)/i', $value))
{
$this->checked_feeds++;
- $feed =& new $this->file_class($value, $this->timeout, 5, null, $this->useragent);
+ $feed = new $this->file_class($value, $this->timeout, 5, null, $this->useragent);
if ($this->is_feed($feed))
{
return $feed;
@@ -10744,7 +10744,7 @@ class SimplePie_Sanitize
if (isset($img['attribs']['src']['data']))
{
$image_url = $img['attribs']['src']['data'];
- $cache =& new $this->cache_class($this->cache_location, call_user_func($this->cache_name_function, $image_url), 'spi');
+ $cache = new $this->cache_class($this->cache_location, call_user_func($this->cache_name_function, $image_url), 'spi');
if ($cache->load())
{
@@ -10753,7 +10753,7 @@ class SimplePie_Sanitize
}
else
{
- $file =& new $this->file_class($image_url, $this->timeout, 5, array('X-FORWARDED-FOR' => $_SERVER['REMOTE_ADDR']), $this->useragent, $this->force_fsockopen);
+ $file = new $this->file_class($image_url, $this->timeout, 5, array('X-FORWARDED-FOR' => $_SERVER['REMOTE_ADDR']), $this->useragent, $this->force_fsockopen);
$headers = $file->headers;
if ($file->success && ($file->status_code == 200 || ($file->status_code > 206 && $file->status_code < 300)))
diff --git a/inc/parser/handler.php b/inc/parser/handler.php
index 9fe5866ad275f120215d2a833486207bf5b759bc..eaa42f9bfbef80d6407cd52ba1146138c45edd07 100644
--- a/inc/parser/handler.php
+++ b/inc/parser/handler.php
@@ -20,7 +20,7 @@ class Doku_Handler {
var $rewriteBlocks = true;
function Doku_Handler() {
- $this->CallWriter = & new Doku_Handler_CallWriter($this);
+ $this->CallWriter = new Doku_Handler_CallWriter($this);
}
function _addCall($handler, $args, $pos) {
@@ -47,7 +47,7 @@ class Doku_Handler {
}
if ( $this->rewriteBlocks ) {
- $B = & new Doku_Handler_Block();
+ $B = new Doku_Handler_Block();
$this->calls = $B->process($this->calls);
}
@@ -212,7 +212,7 @@ class Doku_Handler {
$this->_footnote = true;
- $ReWriter = & new Doku_Handler_Nest($this->CallWriter,'footnote_close');
+ $ReWriter = new Doku_Handler_Nest($this->CallWriter,'footnote_close');
$this->CallWriter = & $ReWriter;
$this->_addCall('footnote_open', array(), $pos);
break;
@@ -240,7 +240,7 @@ class Doku_Handler {
function listblock($match, $state, $pos) {
switch ( $state ) {
case DOKU_LEXER_ENTER:
- $ReWriter = & new Doku_Handler_List($this->CallWriter);
+ $ReWriter = new Doku_Handler_List($this->CallWriter);
$this->CallWriter = & $ReWriter;
$this->_addCall('list_open', array($match), $pos);
break;
@@ -302,7 +302,7 @@ class Doku_Handler {
function preformatted($match, $state, $pos) {
switch ( $state ) {
case DOKU_LEXER_ENTER:
- $ReWriter = & new Doku_Handler_Preformatted($this->CallWriter);
+ $ReWriter = new Doku_Handler_Preformatted($this->CallWriter);
$this->CallWriter = & $ReWriter;
$this->_addCall('preformatted_start',array(), $pos);
break;
@@ -328,7 +328,7 @@ class Doku_Handler {
switch ( $state ) {
case DOKU_LEXER_ENTER:
- $ReWriter = & new Doku_Handler_Quote($this->CallWriter);
+ $ReWriter = new Doku_Handler_Quote($this->CallWriter);
$this->CallWriter = & $ReWriter;
$this->_addCall('quote_start',array($match), $pos);
break;
@@ -580,7 +580,7 @@ class Doku_Handler {
case DOKU_LEXER_ENTER:
- $ReWriter = & new Doku_Handler_Table($this->CallWriter);
+ $ReWriter = new Doku_Handler_Table($this->CallWriter);
$this->CallWriter = & $ReWriter;
$this->_addCall('table_start', array(), $pos);
diff --git a/inc/parser/lexer.php b/inc/parser/lexer.php
index afd260a05cbaa951f69244166063960c71e4c025..211945d8f32a4f9bdc5802fbd47d8f4ceb2d3804 100644
--- a/inc/parser/lexer.php
+++ b/inc/parser/lexer.php
@@ -295,7 +295,7 @@ class Doku_Lexer {
$this->_case = $case;
$this->_regexes = array();
$this->_parser = &$parser;
- $this->_mode = &new Doku_LexerStateStack($start);
+ $this->_mode = new Doku_LexerStateStack($start);
$this->_mode_handlers = array();
}
diff --git a/inc/parser/parser.php b/inc/parser/parser.php
index a78b08a2950cb60102238fb15bda53fbf1c3a3c6..48facd6b5b809e8b6976c090c251f686cd213b25 100644
--- a/inc/parser/parser.php
+++ b/inc/parser/parser.php
@@ -61,7 +61,7 @@ class Doku_Parser {
function addBaseMode(& $BaseMode) {
$this->modes['base'] = & $BaseMode;
if ( !$this->Lexer ) {
- $this->Lexer = & new Doku_Lexer($this->Handler,'base', true);
+ $this->Lexer = new Doku_Lexer($this->Handler,'base', true);
}
$this->modes['base']->Lexer = & $this->Lexer;
}
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index 4ff5f18b82250e1581e9104efd949db259b9e9b9..20acf428189bedfa84497abd2313be873d14e05a 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -966,7 +966,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
}elseif($ext == 'jpg' || $ext == 'jpeg'){
//try to use the caption from IPTC/EXIF
require_once(DOKU_INC.'inc/JpegMeta.php');
- $jpeg =& new JpegMeta(mediaFN($src));
+ $jpeg =new JpegMeta(mediaFN($src));
if($jpeg !== false) $cap = $jpeg->getTitle();
if($cap){
$title = $this->_xmlEntities($cap);
diff --git a/inc/parserutils.php b/inc/parserutils.php
index e2dd859795c59ad1165e184845dacbfa7c727019..471d46903a0f72d602978a018a007afc0d226ebc 100644
--- a/inc/parserutils.php
+++ b/inc/parserutils.php
@@ -204,10 +204,10 @@ function p_get_instructions($text){
$modes = p_get_parsermodes();
// Create the parser
- $Parser = & new Doku_Parser();
+ $Parser = new Doku_Parser();
// Add the Handler
- $Parser->Handler = & new Doku_Handler();
+ $Parser->Handler = new Doku_Handler();
//add modes to parser
foreach($modes as $mode){
@@ -416,7 +416,7 @@ function p_render_metadata($id, $orig){
}
// set up the renderer
- $renderer = & new Doku_Renderer_metadata();
+ $renderer = new Doku_Renderer_metadata();
$renderer->meta = $orig['current'];
$renderer->persistent = $orig['persistent'];
@@ -587,7 +587,7 @@ function & p_get_renderer($mode) {
msg("Renderer '$rname' for $mode not valid",-1);
return null;
}
- $Renderer = & new $rclass();
+ $Renderer = new $rclass();
}else{
// Maybe a plugin/component is available?
list($plugin, $component) = $plugin_controller->_splitName($rname);