Ticket #12367: simplepie_deprecated_notices.diff
File simplepie_deprecated_notices.diff, 46.0 KB (added by , 15 years ago) |
---|
-
wp-includes/class-simplepie.php
735 735 function SimplePie($feed_url = null, $cache_location = null, $cache_duration = null) 736 736 { 737 737 // Other objects, instances created here so we can set options on them 738 $this->sanitize = &new SimplePie_Sanitize;738 $this->sanitize = new SimplePie_Sanitize; 739 739 740 740 // Set options if they're passed to the constructor 741 741 if ($cache_location !== null) … … 1105 1105 { 1106 1106 if (SimplePie_Misc::is_subclass_of($class, 'SimplePie_Sanitize')) 1107 1107 { 1108 $this->sanitize = &new $class;1108 $this->sanitize = new $class; 1109 1109 return true; 1110 1110 } 1111 1111 return false; … … 1599 1599 { 1600 1600 $headers['if-none-match'] = '"' . $this->data['headers']['etag'] . '"'; 1601 1601 } 1602 $file = &new $this->file_class($this->feed_url, $this->timeout/10, 5, $headers, $this->useragent, $this->force_fsockopen);1602 $file = new $this->file_class($this->feed_url, $this->timeout/10, 5, $headers, $this->useragent, $this->force_fsockopen); 1603 1603 if ($file->success) 1604 1604 { 1605 1605 if ($file->status_code === 304) … … 1640 1640 } 1641 1641 else 1642 1642 { 1643 $file = &new $this->file_class($this->feed_url, $this->timeout, 5, null, $this->useragent, $this->force_fsockopen);1643 $file = new $this->file_class($this->feed_url, $this->timeout, 5, null, $this->useragent, $this->force_fsockopen); 1644 1644 } 1645 1645 } 1646 1646 // If the file connection has an error, set SimplePie::error to that and quit … … 1660 1660 if (!$this->force_feed) 1661 1661 { 1662 1662 // Check if the supplied URL is a feed, if it isn't, look for it. 1663 $locate = &new $this->locator_class($file, $this->timeout, $this->useragent, $this->file_class, $this->max_checked_feeds, $this->content_type_sniffer_class);1663 $locate = new $this->locator_class($file, $this->timeout, $this->useragent, $this->file_class, $this->max_checked_feeds, $this->content_type_sniffer_class); 1664 1664 if (!$locate->is_feed($file)) 1665 1665 { 1666 1666 // We need to unset this so that if SimplePie::set_file() has been called that object is untouched … … 1690 1690 1691 1691 $headers = $file->headers; 1692 1692 $data = $file->body; 1693 $sniffer = &new $this->content_type_sniffer_class($file);1693 $sniffer = new $this->content_type_sniffer_class($file); 1694 1694 $sniffed = $sniffer->get_type(); 1695 1695 } 1696 1696 else … … 1760 1760 if ($utf8_data = SimplePie_Misc::change_encoding($data, $encoding, 'UTF-8')) 1761 1761 { 1762 1762 // Create new parser 1763 $parser = &new $this->parser_class();1763 $parser = new $this->parser_class(); 1764 1764 1765 1765 // If it's parsed fine 1766 1766 if ($parser->parse($utf8_data, 'UTF-8')) … … 1971 1971 } 1972 1972 else 1973 1973 { 1974 $file = &new $this->file_class($favicon, $this->timeout / 10, 5, array('X-FORWARDED-FOR' => $_SERVER['REMOTE_ADDR']), $this->useragent, $this->force_fsockopen);1974 $file = new $this->file_class($favicon, $this->timeout / 10, 5, array('X-FORWARDED-FOR' => $_SERVER['REMOTE_ADDR']), $this->useragent, $this->force_fsockopen); 1975 1975 1976 1976 if ($file->success && ($file->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($file->status_code === 200 || $file->status_code > 206 && $file->status_code < 300)) && strlen($file->body) > 0) 1977 1977 { 1978 $sniffer = &new $this->content_type_sniffer_class($file);1978 $sniffer = new $this->content_type_sniffer_class($file); 1979 1979 if (substr($sniffer->get_type(), 0, 6) === 'image/') 1980 1980 { 1981 1981 if ($cache->save(array('headers' => $file->headers, 'body' => $file->body))) … … 2374 2374 { 2375 2375 $label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT); 2376 2376 } 2377 $categories[] = &new $this->category_class($term, $scheme, $label);2377 $categories[] = new $this->category_class($term, $scheme, $label); 2378 2378 } 2379 2379 foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'category') as $category) 2380 2380 { … … 2389 2389 { 2390 2390 $scheme = null; 2391 2391 } 2392 $categories[] = &new $this->category_class($term, $scheme, null);2392 $categories[] = new $this->category_class($term, $scheme, null); 2393 2393 } 2394 2394 foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'subject') as $category) 2395 2395 { 2396 $categories[] = &new $this->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);2396 $categories[] = new $this->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null); 2397 2397 } 2398 2398 foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'subject') as $category) 2399 2399 { 2400 $categories[] = &new $this->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);2400 $categories[] = new $this->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null); 2401 2401 } 2402 2402 2403 2403 if (!empty($categories)) … … 2445 2445 } 2446 2446 if ($name !== null || $email !== null || $uri !== null) 2447 2447 { 2448 $authors[] = &new $this->author_class($name, $uri, $email);2448 $authors[] = new $this->author_class($name, $uri, $email); 2449 2449 } 2450 2450 } 2451 2451 if ($author = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'author')) … … 2467 2467 } 2468 2468 if ($name !== null || $email !== null || $url !== null) 2469 2469 { 2470 $authors[] = &new $this->author_class($name, $url, $email);2470 $authors[] = new $this->author_class($name, $url, $email); 2471 2471 } 2472 2472 } 2473 2473 foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'creator') as $author) 2474 2474 { 2475 $authors[] = &new $this->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);2475 $authors[] = new $this->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null); 2476 2476 } 2477 2477 foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'creator') as $author) 2478 2478 { 2479 $authors[] = &new $this->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);2479 $authors[] = new $this->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null); 2480 2480 } 2481 2481 foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'author') as $author) 2482 2482 { 2483 $authors[] = &new $this->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);2483 $authors[] = new $this->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null); 2484 2484 } 2485 2485 2486 2486 if (!empty($authors)) … … 2528 2528 } 2529 2529 if ($name !== null || $email !== null || $uri !== null) 2530 2530 { 2531 $contributors[] = &new $this->author_class($name, $uri, $email);2531 $contributors[] = new $this->author_class($name, $uri, $email); 2532 2532 } 2533 2533 } 2534 2534 foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'contributor') as $contributor) … … 2550 2550 } 2551 2551 if ($name !== null || $email !== null || $url !== null) 2552 2552 { 2553 $contributors[] = &new $this->author_class($name, $url, $email);2553 $contributors[] = new $this->author_class($name, $url, $email); 2554 2554 } 2555 2555 } 2556 2556 … … 2963 2963 $keys = array_keys($items); 2964 2964 foreach ($keys as $key) 2965 2965 { 2966 $this->data['items'][] = &new $this->item_class($this, $items[$key]);2966 $this->data['items'][] = new $this->item_class($this, $items[$key]); 2967 2967 } 2968 2968 } 2969 2969 if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'entry')) … … 2971 2971 $keys = array_keys($items); 2972 2972 foreach ($keys as $key) 2973 2973 { 2974 $this->data['items'][] = &new $this->item_class($this, $items[$key]);2974 $this->data['items'][] = new $this->item_class($this, $items[$key]); 2975 2975 } 2976 2976 } 2977 2977 if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'item')) … … 2979 2979 $keys = array_keys($items); 2980 2980 foreach ($keys as $key) 2981 2981 { 2982 $this->data['items'][] = &new $this->item_class($this, $items[$key]);2982 $this->data['items'][] = new $this->item_class($this, $items[$key]); 2983 2983 } 2984 2984 } 2985 2985 if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'item')) … … 2987 2987 $keys = array_keys($items); 2988 2988 foreach ($keys as $key) 2989 2989 { 2990 $this->data['items'][] = &new $this->item_class($this, $items[$key]);2990 $this->data['items'][] = new $this->item_class($this, $items[$key]); 2991 2991 } 2992 2992 } 2993 2993 if ($items = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'item')) … … 2995 2995 $keys = array_keys($items); 2996 2996 foreach ($keys as $key) 2997 2997 { 2998 $this->data['items'][] = &new $this->item_class($this, $items[$key]);2998 $this->data['items'][] = new $this->item_class($this, $items[$key]); 2999 2999 } 3000 3000 } 3001 3001 } … … 3346 3346 { 3347 3347 $label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT); 3348 3348 } 3349 $categories[] = &new $this->feed->category_class($term, $scheme, $label);3349 $categories[] = new $this->feed->category_class($term, $scheme, $label); 3350 3350 } 3351 3351 foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'category') as $category) 3352 3352 { … … 3361 3361 { 3362 3362 $scheme = null; 3363 3363 } 3364 $categories[] = &new $this->feed->category_class($term, $scheme, null);3364 $categories[] = new $this->feed->category_class($term, $scheme, null); 3365 3365 } 3366 3366 foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'subject') as $category) 3367 3367 { 3368 $categories[] = &new $this->feed->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);3368 $categories[] = new $this->feed->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null); 3369 3369 } 3370 3370 foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'subject') as $category) 3371 3371 { 3372 $categories[] = &new $this->feed->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);3372 $categories[] = new $this->feed->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null); 3373 3373 } 3374 3374 3375 3375 if (!empty($categories)) … … 3430 3430 } 3431 3431 if ($name !== null || $email !== null || $uri !== null) 3432 3432 { 3433 $contributors[] = &new $this->feed->author_class($name, $uri, $email);3433 $contributors[] = new $this->feed->author_class($name, $uri, $email); 3434 3434 } 3435 3435 } 3436 3436 foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'contributor') as $contributor) … … 3452 3452 } 3453 3453 if ($name !== null || $email !== null || $url !== null) 3454 3454 { 3455 $contributors[] = &new $this->feed->author_class($name, $url, $email);3455 $contributors[] = new $this->feed->author_class($name, $url, $email); 3456 3456 } 3457 3457 } 3458 3458 … … 3488 3488 } 3489 3489 if ($name !== null || $email !== null || $uri !== null) 3490 3490 { 3491 $authors[] = &new $this->feed->author_class($name, $uri, $email);3491 $authors[] = new $this->feed->author_class($name, $uri, $email); 3492 3492 } 3493 3493 } 3494 3494 if ($author = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'author')) … … 3510 3510 } 3511 3511 if ($name !== null || $email !== null || $url !== null) 3512 3512 { 3513 $authors[] = &new $this->feed->author_class($name, $url, $email);3513 $authors[] = new $this->feed->author_class($name, $url, $email); 3514 3514 } 3515 3515 } 3516 3516 if ($author = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'author')) 3517 3517 { 3518 $authors[] = &new $this->feed->author_class(null, null, $this->sanitize($author[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));3518 $authors[] = new $this->feed->author_class(null, null, $this->sanitize($author[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT)); 3519 3519 } 3520 3520 foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'creator') as $author) 3521 3521 { 3522 $authors[] = &new $this->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);3522 $authors[] = new $this->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null); 3523 3523 } 3524 3524 foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'creator') as $author) 3525 3525 { 3526 $authors[] = &new $this->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);3526 $authors[] = new $this->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null); 3527 3527 } 3528 3528 foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'author') as $author) 3529 3529 { 3530 $authors[] = &new $this->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);3530 $authors[] = new $this->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null); 3531 3531 } 3532 3532 3533 3533 if (!empty($authors)) … … 3837 3837 { 3838 3838 $caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT); 3839 3839 } 3840 $captions_parent[] = &new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);3840 $captions_parent[] = new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text); 3841 3841 } 3842 3842 } 3843 3843 elseif ($captions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'text')) … … 3869 3869 { 3870 3870 $caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT); 3871 3871 } 3872 $captions_parent[] = &new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);3872 $captions_parent[] = new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text); 3873 3873 } 3874 3874 } 3875 3875 if (is_array($captions_parent)) … … 3899 3899 { 3900 3900 $label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT); 3901 3901 } 3902 $categories_parent[] = &new $this->feed->category_class($term, $scheme, $label);3902 $categories_parent[] = new $this->feed->category_class($term, $scheme, $label); 3903 3903 } 3904 3904 foreach ((array) $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'category') as $category) 3905 3905 { … … 3922 3922 { 3923 3923 $label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT); 3924 3924 } 3925 $categories_parent[] = &new $this->feed->category_class($term, $scheme, $label);3925 $categories_parent[] = new $this->feed->category_class($term, $scheme, $label); 3926 3926 } 3927 3927 foreach ((array) $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'category') as $category) 3928 3928 { … … 3933 3933 { 3934 3934 $label = $this->sanitize($category['attribs']['']['text'], SIMPLEPIE_CONSTRUCT_TEXT); 3935 3935 } 3936 $categories_parent[] = &new $this->feed->category_class($term, $scheme, $label);3936 $categories_parent[] = new $this->feed->category_class($term, $scheme, $label); 3937 3937 3938 3938 if (isset($category['child'][SIMPLEPIE_NAMESPACE_ITUNES]['category'])) 3939 3939 { … … 3943 3943 { 3944 3944 $label = $this->sanitize($subcategory['attribs']['']['text'], SIMPLEPIE_CONSTRUCT_TEXT); 3945 3945 } 3946 $categories_parent[] = &new $this->feed->category_class($term, $scheme, $label);3946 $categories_parent[] = new $this->feed->category_class($term, $scheme, $label); 3947 3947 } 3948 3948 } 3949 3949 } … … 3965 3965 { 3966 3966 $copyright_label = $this->sanitize($copyright[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); 3967 3967 } 3968 $copyrights_parent = &new $this->feed->copyright_class($copyright_url, $copyright_label);3968 $copyrights_parent = new $this->feed->copyright_class($copyright_url, $copyright_label); 3969 3969 } 3970 3970 elseif ($copyright = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'copyright')) 3971 3971 { … … 3979 3979 { 3980 3980 $copyright_label = $this->sanitize($copyright[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); 3981 3981 } 3982 $copyrights_parent = &new $this->feed->copyright_class($copyright_url, $copyright_label);3982 $copyrights_parent = new $this->feed->copyright_class($copyright_url, $copyright_label); 3983 3983 } 3984 3984 3985 3985 // CREDITS … … 4006 4006 { 4007 4007 $credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT); 4008 4008 } 4009 $credits_parent[] = &new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);4009 $credits_parent[] = new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name); 4010 4010 } 4011 4011 } 4012 4012 elseif ($credits = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'credit')) … … 4032 4032 { 4033 4033 $credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT); 4034 4034 } 4035 $credits_parent[] = &new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);4035 $credits_parent[] = new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name); 4036 4036 } 4037 4037 } 4038 4038 if (is_array($credits_parent)) … … 4221 4221 { 4222 4222 $rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT); 4223 4223 } 4224 $ratings_parent[] = &new $this->feed->rating_class($rating_scheme, $rating_value);4224 $ratings_parent[] = new $this->feed->rating_class($rating_scheme, $rating_value); 4225 4225 } 4226 4226 } 4227 4227 elseif ($ratings = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'explicit')) … … 4234 4234 { 4235 4235 $rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT); 4236 4236 } 4237 $ratings_parent[] = &new $this->feed->rating_class($rating_scheme, $rating_value);4237 $ratings_parent[] = new $this->feed->rating_class($rating_scheme, $rating_value); 4238 4238 } 4239 4239 } 4240 4240 elseif ($ratings = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'rating')) … … 4255 4255 { 4256 4256 $rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT); 4257 4257 } 4258 $ratings_parent[] = &new $this->feed->rating_class($rating_scheme, $rating_value);4258 $ratings_parent[] = new $this->feed->rating_class($rating_scheme, $rating_value); 4259 4259 } 4260 4260 } 4261 4261 elseif ($ratings = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'explicit')) … … 4268 4268 { 4269 4269 $rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT); 4270 4270 } 4271 $ratings_parent[] = &new $this->feed->rating_class($rating_scheme, $rating_value);4271 $ratings_parent[] = new $this->feed->rating_class($rating_scheme, $rating_value); 4272 4272 } 4273 4273 } 4274 4274 if (is_array($ratings_parent)) … … 4296 4296 { 4297 4297 $restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT); 4298 4298 } 4299 $restrictions_parent[] = &new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);4299 $restrictions_parent[] = new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value); 4300 4300 } 4301 4301 } 4302 4302 elseif ($restrictions = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'block')) … … 4310 4310 { 4311 4311 $restriction_relationship = 'deny'; 4312 4312 } 4313 $restrictions_parent[] = &new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);4313 $restrictions_parent[] = new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value); 4314 4314 } 4315 4315 } 4316 4316 elseif ($restrictions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'restriction')) … … 4332 4332 { 4333 4333 $restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT); 4334 4334 } 4335 $restrictions_parent[] = &new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);4335 $restrictions_parent[] = new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value); 4336 4336 } 4337 4337 } 4338 4338 elseif ($restrictions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'block')) … … 4346 4346 { 4347 4347 $restriction_relationship = 'deny'; 4348 4348 } 4349 $restrictions_parent[] = &new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);4349 $restrictions_parent[] = new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value); 4350 4350 } 4351 4351 } 4352 4352 if (is_array($restrictions_parent)) … … 4550 4550 { 4551 4551 $caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT); 4552 4552 } 4553 $captions[] = &new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);4553 $captions[] = new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text); 4554 4554 } 4555 4555 if (is_array($captions)) 4556 4556 { … … 4586 4586 { 4587 4587 $caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT); 4588 4588 } 4589 $captions[] = &new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);4589 $captions[] = new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text); 4590 4590 } 4591 4591 if (is_array($captions)) 4592 4592 { … … 4622 4622 { 4623 4623 $label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT); 4624 4624 } 4625 $categories[] = &new $this->feed->category_class($term, $scheme, $label);4625 $categories[] = new $this->feed->category_class($term, $scheme, $label); 4626 4626 } 4627 4627 } 4628 4628 if (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['category'])) … … 4648 4648 { 4649 4649 $label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT); 4650 4650 } 4651 $categories[] = &new $this->feed->category_class($term, $scheme, $label);4651 $categories[] = new $this->feed->category_class($term, $scheme, $label); 4652 4652 } 4653 4653 } 4654 4654 if (is_array($categories) && is_array($categories_parent)) … … 4677 4677 { 4678 4678 $copyright_label = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); 4679 4679 } 4680 $copyrights = &new $this->feed->copyright_class($copyright_url, $copyright_label);4680 $copyrights = new $this->feed->copyright_class($copyright_url, $copyright_label); 4681 4681 } 4682 4682 elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'])) 4683 4683 { … … 4691 4691 { 4692 4692 $copyright_label = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); 4693 4693 } 4694 $copyrights = &new $this->feed->copyright_class($copyright_url, $copyright_label);4694 $copyrights = new $this->feed->copyright_class($copyright_url, $copyright_label); 4695 4695 } 4696 4696 else 4697 4697 { … … 4722 4722 { 4723 4723 $credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT); 4724 4724 } 4725 $credits[] = &new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);4725 $credits[] = new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name); 4726 4726 } 4727 4727 if (is_array($credits)) 4728 4728 { … … 4752 4752 { 4753 4753 $credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT); 4754 4754 } 4755 $credits[] = &new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);4755 $credits[] = new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name); 4756 4756 } 4757 4757 if (is_array($credits)) 4758 4758 { … … 4905 4905 { 4906 4906 $rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT); 4907 4907 } 4908 $ratings[] = &new $this->feed->rating_class($rating_scheme, $rating_value);4908 $ratings[] = new $this->feed->rating_class($rating_scheme, $rating_value); 4909 4909 } 4910 4910 if (is_array($ratings)) 4911 4911 { … … 4930 4930 { 4931 4931 $rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT); 4932 4932 } 4933 $ratings[] = &new $this->feed->rating_class($rating_scheme, $rating_value);4933 $ratings[] = new $this->feed->rating_class($rating_scheme, $rating_value); 4934 4934 } 4935 4935 if (is_array($ratings)) 4936 4936 { … … 4962 4962 { 4963 4963 $restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT); 4964 4964 } 4965 $restrictions[] = &new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);4965 $restrictions[] = new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value); 4966 4966 } 4967 4967 if (is_array($restrictions)) 4968 4968 { … … 4988 4988 { 4989 4989 $restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT); 4990 4990 } 4991 $restrictions[] = &new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);4991 $restrictions[] = new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value); 4992 4992 } 4993 4993 if (is_array($restrictions)) 4994 4994 { … … 5042 5042 $title = $title_parent; 5043 5043 } 5044 5044 5045 $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);5045 $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); 5046 5046 } 5047 5047 } 5048 5048 } … … 5171 5171 { 5172 5172 $caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT); 5173 5173 } 5174 $captions[] = &new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);5174 $captions[] = new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text); 5175 5175 } 5176 5176 if (is_array($captions)) 5177 5177 { … … 5207 5207 { 5208 5208 $label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT); 5209 5209 } 5210 $categories[] = &new $this->feed->category_class($term, $scheme, $label);5210 $categories[] = new $this->feed->category_class($term, $scheme, $label); 5211 5211 } 5212 5212 } 5213 5213 if (is_array($categories) && is_array($categories_parent)) … … 5240 5240 { 5241 5241 $copyright_label = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); 5242 5242 } 5243 $copyrights = &new $this->feed->copyright_class($copyright_url, $copyright_label);5243 $copyrights = new $this->feed->copyright_class($copyright_url, $copyright_label); 5244 5244 } 5245 5245 else 5246 5246 { … … 5271 5271 { 5272 5272 $credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT); 5273 5273 } 5274 $credits[] = &new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);5274 $credits[] = new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name); 5275 5275 } 5276 5276 if (is_array($credits)) 5277 5277 { … … 5375 5375 { 5376 5376 $rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT); 5377 5377 } 5378 $ratings[] = &new $this->feed->rating_class($rating_scheme, $rating_value);5378 $ratings[] = new $this->feed->rating_class($rating_scheme, $rating_value); 5379 5379 } 5380 5380 if (is_array($ratings)) 5381 5381 { … … 5407 5407 { 5408 5408 $restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT); 5409 5409 } 5410 $restrictions[] = &new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);5410 $restrictions[] = new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value); 5411 5411 } 5412 5412 if (is_array($restrictions)) 5413 5413 { … … 5446 5446 $title = $title_parent; 5447 5447 } 5448 5448 5449 $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);5449 $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); 5450 5450 } 5451 5451 } 5452 5452 } … … 5482 5482 } 5483 5483 5484 5484 // Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor 5485 $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);5485 $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); 5486 5486 } 5487 5487 } 5488 5488 … … 5517 5517 } 5518 5518 5519 5519 // Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor 5520 $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);5520 $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); 5521 5521 } 5522 5522 } 5523 5523 … … 5552 5552 } 5553 5553 5554 5554 // Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor 5555 $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);5555 $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); 5556 5556 } 5557 5557 } 5558 5558 5559 5559 if (sizeof($this->data['enclosures']) === 0 && ($url || $type || $length || $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)) 5560 5560 { 5561 5561 // Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor 5562 $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);5562 $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); 5563 5563 } 5564 5564 5565 5565 $this->data['enclosures'] = array_values(SimplePie_Misc::array_unique($this->data['enclosures'])); … … 5836 5836 { 5837 5837 $label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT); 5838 5838 } 5839 $categories[] = &new $this->item->feed->category_class($term, $scheme, $label);5839 $categories[] = new $this->item->feed->category_class($term, $scheme, $label); 5840 5840 } 5841 5841 foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'category') as $category) 5842 5842 { … … 5851 5851 { 5852 5852 $scheme = null; 5853 5853 } 5854 $categories[] = &new $this->item->feed->category_class($term, $scheme, null);5854 $categories[] = new $this->item->feed->category_class($term, $scheme, null); 5855 5855 } 5856 5856 foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'subject') as $category) 5857 5857 { 5858 $categories[] = &new $this->item->feed->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);5858 $categories[] = new $this->item->feed->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null); 5859 5859 } 5860 5860 foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'subject') as $category) 5861 5861 { 5862 $categories[] = &new $this->item->feed->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);5862 $categories[] = new $this->item->feed->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null); 5863 5863 } 5864 5864 5865 5865 if (!empty($categories)) … … 5907 5907 } 5908 5908 if ($name !== null || $email !== null || $uri !== null) 5909 5909 { 5910 $authors[] = &new $this->item->feed->author_class($name, $uri, $email);5910 $authors[] = new $this->item->feed->author_class($name, $uri, $email); 5911 5911 } 5912 5912 } 5913 5913 if ($author = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'author')) … … 5929 5929 } 5930 5930 if ($name !== null || $email !== null || $url !== null) 5931 5931 { 5932 $authors[] = &new $this->item->feed->author_class($name, $url, $email);5932 $authors[] = new $this->item->feed->author_class($name, $url, $email); 5933 5933 } 5934 5934 } 5935 5935 foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'creator') as $author) 5936 5936 { 5937 $authors[] = &new $this->item->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);5937 $authors[] = new $this->item->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null); 5938 5938 } 5939 5939 foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'creator') as $author) 5940 5940 { 5941 $authors[] = &new $this->item->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);5941 $authors[] = new $this->item->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null); 5942 5942 } 5943 5943 foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'author') as $author) 5944 5944 { 5945 $authors[] = &new $this->item->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);5945 $authors[] = new $this->item->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null); 5946 5946 } 5947 5947 5948 5948 if (!empty($authors)) … … 5990 5990 } 5991 5991 if ($name !== null || $email !== null || $uri !== null) 5992 5992 { 5993 $contributors[] = &new $this->item->feed->author_class($name, $uri, $email);5993 $contributors[] = new $this->item->feed->author_class($name, $uri, $email); 5994 5994 } 5995 5995 } 5996 5996 foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'contributor') as $contributor) … … 6012 6012 } 6013 6013 if ($name !== null || $email !== null || $url !== null) 6014 6014 { 6015 $contributors[] = &new $this->item->feed->author_class($name, $url, $email);6015 $contributors[] = new $this->item->feed->author_class($name, $url, $email); 6016 6016 } 6017 6017 } 6018 6018 … … 6449 6449 $this->width = $width; 6450 6450 if (class_exists('idna_convert')) 6451 6451 { 6452 $idn = &new idna_convert;6452 $idn = new idna_convert; 6453 6453 $parsed = SimplePie_Misc::parse_url($link); 6454 6454 $this->link = SimplePie_Misc::compress_parse_url($parsed['scheme'], $idn->encode($parsed['authority']), $parsed['path'], $parsed['query'], $parsed['fragment']); 6455 6455 } … … 7647 7647 { 7648 7648 if (class_exists('idna_convert')) 7649 7649 { 7650 $idn = &new idna_convert;7650 $idn = new idna_convert; 7651 7651 $parsed = SimplePie_Misc::parse_url($url); 7652 7652 $url = SimplePie_Misc::compress_parse_url($parsed['scheme'], $idn->encode($parsed['authority']), $parsed['path'], $parsed['query'], $parsed['fragment']); 7653 7653 } … … 7708 7708 curl_close($fp); 7709 7709 $this->headers = explode("\r\n\r\n", $this->headers, $info['redirect_count'] + 1); 7710 7710 $this->headers = array_pop($this->headers); 7711 $parser = &new SimplePie_HTTP_Parser($this->headers);7711 $parser = new SimplePie_HTTP_Parser($this->headers); 7712 7712 if ($parser->parse()) 7713 7713 { 7714 7714 $this->headers = $parser->headers; … … 7789 7789 } 7790 7790 if (!$info['timed_out']) 7791 7791 { 7792 $parser = &new SimplePie_HTTP_Parser($this->headers);7792 $parser = new SimplePie_HTTP_Parser($this->headers); 7793 7793 if ($parser->parse()) 7794 7794 { 7795 7795 $this->headers = $parser->headers; … … 7808 7808 { 7809 7809 case 'gzip': 7810 7810 case 'x-gzip': 7811 $decoder = &new SimplePie_gzdecode($this->body);7811 $decoder = new SimplePie_gzdecode($this->body); 7812 7812 if (!$decoder->parse()) 7813 7813 { 7814 7814 $this->error = 'Unable to decode HTTP "gzip" stream'; … … 8620 8620 */ 8621 8621 function create($location, $filename, $extension) 8622 8622 { 8623 $location_iri = &new SimplePie_IRI($location);8623 $location_iri = new SimplePie_IRI($location); 8624 8624 switch ($location_iri->get_scheme()) 8625 8625 { 8626 8626 case 'mysql': … … 9317 9317 9318 9318 function parse_url($url) 9319 9319 { 9320 $iri = &new SimplePie_IRI($url);9320 $iri = new SimplePie_IRI($url); 9321 9321 return array( 9322 9322 'scheme' => (string) $iri->get_scheme(), 9323 9323 'authority' => (string) $iri->get_authority(), … … 9329 9329 9330 9330 function compress_parse_url($scheme = '', $authority = '', $path = '', $query = '', $fragment = '') 9331 9331 { 9332 $iri = &new SimplePie_IRI('');9332 $iri = new SimplePie_IRI(''); 9333 9333 $iri->set_scheme($scheme); 9334 9334 $iri->set_authority($authority); 9335 9335 $iri->set_path($path); … … 9340 9340 9341 9341 function normalize_url($url) 9342 9342 { 9343 $iri = &new SimplePie_IRI($url);9343 $iri = new SimplePie_IRI($url); 9344 9344 return $iri->get_iri(); 9345 9345 } 9346 9346 … … 10860 10860 */ 10861 10861 function entities_decode($data) 10862 10862 { 10863 $decoder = &new SimplePie_Decode_HTML_Entities($data);10863 $decoder = new SimplePie_Decode_HTML_Entities($data); 10864 10864 return $decoder->parse(); 10865 10865 } 10866 10866 … … 11256 11256 { 11257 11257 if ($pos = strpos($data, "\x00\x00\x00\x3F\x00\x00\x00\x3E")) 11258 11258 { 11259 $parser = &new SimplePie_XML_Declaration_Parser(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 20), 'UTF-32BE', 'UTF-8'));11259 $parser = new SimplePie_XML_Declaration_Parser(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 20), 'UTF-32BE', 'UTF-8')); 11260 11260 if ($parser->parse()) 11261 11261 { 11262 11262 $encoding[] = $parser->encoding; … … 11269 11269 { 11270 11270 if ($pos = strpos($data, "\x3F\x00\x00\x00\x3E\x00\x00\x00")) 11271 11271 { 11272 $parser = &new SimplePie_XML_Declaration_Parser(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 20), 'UTF-32LE', 'UTF-8'));11272 $parser = new SimplePie_XML_Declaration_Parser(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 20), 'UTF-32LE', 'UTF-8')); 11273 11273 if ($parser->parse()) 11274 11274 { 11275 11275 $encoding[] = $parser->encoding; … … 11282 11282 { 11283 11283 if ($pos = strpos($data, "\x00\x3F\x00\x3E")) 11284 11284 { 11285 $parser = &new SimplePie_XML_Declaration_Parser(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 10), 'UTF-16BE', 'UTF-8'));11285 $parser = new SimplePie_XML_Declaration_Parser(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 10), 'UTF-16BE', 'UTF-8')); 11286 11286 if ($parser->parse()) 11287 11287 { 11288 11288 $encoding[] = $parser->encoding; … … 11295 11295 { 11296 11296 if ($pos = strpos($data, "\x3F\x00\x3E\x00")) 11297 11297 { 11298 $parser = &new SimplePie_XML_Declaration_Parser(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 10), 'UTF-16LE', 'UTF-8'));11298 $parser = new SimplePie_XML_Declaration_Parser(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 10), 'UTF-16LE', 'UTF-8')); 11299 11299 if ($parser->parse()) 11300 11300 { 11301 11301 $encoding[] = $parser->encoding; … … 11308 11308 { 11309 11309 if ($pos = strpos($data, "\x3F\x3E")) 11310 11310 { 11311 $parser = &new SimplePie_XML_Declaration_Parser(substr($data, 5, $pos - 5));11311 $parser = new SimplePie_XML_Declaration_Parser(substr($data, 5, $pos - 5)); 11312 11312 if ($parser->parse()) 11313 11313 { 11314 11314 $encoding[] = $parser->encoding; … … 11683 11683 $relative = (string) $relative; 11684 11684 if ($relative !== '') 11685 11685 { 11686 $relative = &new SimplePie_IRI($relative);11686 $relative = new SimplePie_IRI($relative); 11687 11687 if ($relative->get_scheme() !== null) 11688 11688 { 11689 11689 $target = $relative; … … 11697 11697 } 11698 11698 else 11699 11699 { 11700 $target = &new SimplePie_IRI('');11700 $target = new SimplePie_IRI(''); 11701 11701 $target->set_scheme($base->get_scheme()); 11702 11702 $target->set_userinfo($base->get_userinfo()); 11703 11703 $target->set_host($base->get_host()); … … 13049 13049 static $object; 13050 13050 if (!$object) 13051 13051 { 13052 $object = &new SimplePie_Parse_Date;13052 $object = new SimplePie_Parse_Date; 13053 13053 } 13054 13054 return $object; 13055 13055 } … … 14084 14084 14085 14085 if ($this->file->method & SIMPLEPIE_FILE_SOURCE_REMOTE) 14086 14086 { 14087 $sniffer = &new $this->content_type_sniffer_class($this->file);14087 $sniffer = new $this->content_type_sniffer_class($this->file); 14088 14088 if ($sniffer->get_type() !== 'text/html') 14089 14089 { 14090 14090 return null; … … 14130 14130 { 14131 14131 if ($file->method & SIMPLEPIE_FILE_SOURCE_REMOTE) 14132 14132 { 14133 $sniffer = &new $this->content_type_sniffer_class($file);14133 $sniffer = new $this->content_type_sniffer_class($file); 14134 14134 $sniffed = $sniffer->get_type(); 14135 14135 if (in_array($sniffed, array('application/rss+xml', 'application/rdf+xml', 'text/rdf', 'application/atom+xml', 'text/xml', 'application/xml'))) 14136 14136 { … … 14194 14194 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'))) && !isset($feeds[$href])) 14195 14195 { 14196 14196 $this->checked_feeds++; 14197 $feed = &new $this->file_class($href, $this->timeout, 5, null, $this->useragent);14197 $feed = new $this->file_class($href, $this->timeout, 5, null, $this->useragent); 14198 14198 if ($feed->success && ($feed->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($feed->status_code === 200 || $feed->status_code > 206 && $feed->status_code < 300)) && $this->is_feed($feed)) 14199 14199 { 14200 14200 $feeds[$href] = $feed; … … 14266 14266 if (in_array(strtolower(strrchr($value, '.')), array('.rss', '.rdf', '.atom', '.xml'))) 14267 14267 { 14268 14268 $this->checked_feeds++; 14269 $feed = &new $this->file_class($value, $this->timeout, 5, null, $this->useragent);14269 $feed = new $this->file_class($value, $this->timeout, 5, null, $this->useragent); 14270 14270 if ($feed->success && ($feed->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($feed->status_code === 200 || $feed->status_code > 206 && $feed->status_code < 300)) && $this->is_feed($feed)) 14271 14271 { 14272 14272 return $feed; … … 14291 14291 if (preg_match('/(rss|rdf|atom|xml)/i', $value)) 14292 14292 { 14293 14293 $this->checked_feeds++; 14294 $feed = &new $this->file_class($value, $this->timeout, 5, null, $this->useragent);14294 $feed = new $this->file_class($value, $this->timeout, 5, null, $this->useragent); 14295 14295 if ($feed->success && ($feed->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($feed->status_code === 200 || $feed->status_code > 206 && $feed->status_code < 300)) && $this->is_feed($feed)) 14296 14296 { 14297 14297 return $feed; … … 14365 14365 14366 14366 if (substr($data, 0, 5) === '<?xml' && strspn(substr($data, 5, 1), "\x09\x0A\x0D\x20") && ($pos = strpos($data, '?>')) !== false) 14367 14367 { 14368 $declaration = &new SimplePie_XML_Declaration_Parser(substr($data, 5, $pos - 5));14368 $declaration = new SimplePie_XML_Declaration_Parser(substr($data, 5, $pos - 5)); 14369 14369 if ($declaration->parse()) 14370 14370 { 14371 14371 $data = substr($data, $pos + 2); … … 14415 14415 else 14416 14416 { 14417 14417 libxml_clear_errors(); 14418 $xml = &new XMLReader();14418 $xml = new XMLReader(); 14419 14419 $xml->xml($data); 14420 14420 while (@$xml->read()) 14421 14421 { … … 14901 14901 } 14902 14902 else 14903 14903 { 14904 $file = &new $this->file_class($img['attribs']['src']['data'], $this->timeout, 5, array('X-FORWARDED-FOR' => $_SERVER['REMOTE_ADDR']), $this->useragent, $this->force_fsockopen);14904 $file = new $this->file_class($img['attribs']['src']['data'], $this->timeout, 5, array('X-FORWARDED-FOR' => $_SERVER['REMOTE_ADDR']), $this->useragent, $this->force_fsockopen); 14905 14905 $headers = $file->headers; 14906 14906 14907 14907 if ($file->success && ($file->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($file->status_code === 200 || $file->status_code > 206 && $file->status_code < 300)))