Context Navigation

Back to Ticket #12709

Ticket #12709: simplepie-#12709.diff

File simplepie-#12709.diff, 46.0 KB (added by j_schumann, 18 months ago)
fix new by reference in class-simplepie.php

Line
1	Index: wp-includes/class-simplepie.php
2	===================================================================
3	--- wp-includes/class-simplepie.php (revision 19456)
4	+++ wp-includes/class-simplepie.php (working copy)
5	@@ -735,7 +735,7 @@
6	function SimplePie($feed_url = null, $cache_location = null, $cache_duration = null)
7	{
8	// Other objects, instances created here so we can set options on them
9	- $this->sanitize =& new SimplePie_Sanitize;
10	+ $this->sanitize = new SimplePie_Sanitize;
11
12	// Set options if they're passed to the constructor
13	if ($cache_location !== null)
14	@@ -1105,7 +1105,7 @@
15	{
16	if (SimplePie_Misc::is_subclass_of($class, 'SimplePie_Sanitize'))
17	{
18	- $this->sanitize =& new $class;
19	+ $this->sanitize = new $class;
20	return true;
21	}
22	return false;
23	@@ -1599,7 +1599,7 @@
24	{
25	$headers['if-none-match'] = '"' . $this->data['headers']['etag'] . '"';
26	}
27	- $file =& new $this->file_class($this->feed_url, $this->timeout/10, 5, $headers, $this->useragent, $this->force_fsockopen);
28	+ $file = new $this->file_class($this->feed_url, $this->timeout/10, 5, $headers, $this->useragent, $this->force_fsockopen);
29	if ($file->success)
30	{
31	if ($file->status_code === 304)
32	@@ -1640,7 +1640,7 @@
33	}
34	else
35	{
36	- $file =& new $this->file_class($this->feed_url, $this->timeout, 5, null, $this->useragent, $this->force_fsockopen);
37	+ $file = new $this->file_class($this->feed_url, $this->timeout, 5, null, $this->useragent, $this->force_fsockopen);
38	}
39	}
40	// If the file connection has an error, set SimplePie::error to that and quit
41	@@ -1660,7 +1660,7 @@
42	if (!$this->force_feed)
43	{
44	// Check if the supplied URL is a feed, if it isn't, look for it.
45	- $locate =& new $this->locator_class($file, $this->timeout, $this->useragent, $this->file_class, $this->max_checked_feeds, $this->content_type_sniffer_class);
46	+ $locate = new $this->locator_class($file, $this->timeout, $this->useragent, $this->file_class, $this->max_checked_feeds, $this->content_type_sniffer_class);
47	if (!$locate->is_feed($file))
48	{
49	// We need to unset this so that if SimplePie::set_file() has been called that object is untouched
50	@@ -1690,7 +1690,7 @@
51
52	$headers = $file->headers;
53	$data = $file->body;
54	- $sniffer =& new $this->content_type_sniffer_class($file);
55	+ $sniffer = new $this->content_type_sniffer_class($file);
56	$sniffed = $sniffer->get_type();
57	}
58	else
59	@@ -1760,7 +1760,7 @@
60	if ($utf8_data = SimplePie_Misc::change_encoding($data, $encoding, 'UTF-8'))
61	{
62	// Create new parser
63	- $parser =& new $this->parser_class();
64	+ $parser = new $this->parser_class();
65
66	// If it's parsed fine
67	if ($parser->parse($utf8_data, 'UTF-8'))
68	@@ -1971,11 +1971,11 @@
69	}
70	else
71	{
72	- $file =& new $this->file_class($favicon, $this->timeout / 10, 5, array('X-FORWARDED-FOR' => $_SERVER['REMOTE_ADDR']), $this->useragent, $this->force_fsockopen);
73	+ $file = new $this->file_class($favicon, $this->timeout / 10, 5, array('X-FORWARDED-FOR' => $_SERVER['REMOTE_ADDR']), $this->useragent, $this->force_fsockopen);
74
75	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)
76	{
77	- $sniffer =& new $this->content_type_sniffer_class($file);
78	+ $sniffer = new $this->content_type_sniffer_class($file);
79	if (substr($sniffer->get_type(), 0, 6) === 'image/')
80	{
81	if ($cache->save(array('headers' => $file->headers, 'body' => $file->body)))
82	@@ -2374,7 +2374,7 @@
83	{
84	$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
85	}
86	- $categories[] =& new $this->category_class($term, $scheme, $label);
87	+ $categories[] = new $this->category_class($term, $scheme, $label);
88	}
89	foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'category') as $category)
90	{
91	@@ -2389,15 +2389,15 @@
92	{
93	$scheme = null;
94	}
95	- $categories[] =& new $this->category_class($term, $scheme, null);
96	+ $categories[] = new $this->category_class($term, $scheme, null);
97	}
98	foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'subject') as $category)
99	{
100	- $categories[] =& new $this->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
101	+ $categories[] = new $this->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
102	}
103	foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'subject') as $category)
104	{
105	- $categories[] =& new $this->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
106	+ $categories[] = new $this->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
107	}
108
109	if (!empty($categories))
110	@@ -2445,7 +2445,7 @@
111	}
112	if ($name !== null \|\| $email !== null \|\| $uri !== null)
113	{
114	- $authors[] =& new $this->author_class($name, $uri, $email);
115	+ $authors[] = new $this->author_class($name, $uri, $email);
116	}
117	}
118	if ($author = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'author'))
119	@@ -2467,20 +2467,20 @@
120	}
121	if ($name !== null \|\| $email !== null \|\| $url !== null)
122	{
123	- $authors[] =& new $this->author_class($name, $url, $email);
124	+ $authors[] = new $this->author_class($name, $url, $email);
125	}
126	}
127	foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'creator') as $author)
128	{
129	- $authors[] =& new $this->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
130	+ $authors[] = new $this->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
131	}
132	foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'creator') as $author)
133	{
134	- $authors[] =& new $this->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
135	+ $authors[] = new $this->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
136	}
137	foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'author') as $author)
138	{
139	- $authors[] =& new $this->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
140	+ $authors[] = new $this->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
141	}
142
143	if (!empty($authors))
144	@@ -2528,7 +2528,7 @@
145	}
146	if ($name !== null \|\| $email !== null \|\| $uri !== null)
147	{
148	- $contributors[] =& new $this->author_class($name, $uri, $email);
149	+ $contributors[] = new $this->author_class($name, $uri, $email);
150	}
151	}
152	foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'contributor') as $contributor)
153	@@ -2550,7 +2550,7 @@
154	}
155	if ($name !== null \|\| $email !== null \|\| $url !== null)
156	{
157	- $contributors[] =& new $this->author_class($name, $url, $email);
158	+ $contributors[] = new $this->author_class($name, $url, $email);
159	}
160	}
161
162	@@ -2963,7 +2963,7 @@
163	$keys = array_keys($items);
164	foreach ($keys as $key)
165	{
166	- $this->data['items'][] =& new $this->item_class($this, $items[$key]);
167	+ $this->data['items'][] = new $this->item_class($this, $items[$key]);
168	}
169	}
170	if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'entry'))
171	@@ -2971,7 +2971,7 @@
172	$keys = array_keys($items);
173	foreach ($keys as $key)
174	{
175	- $this->data['items'][] =& new $this->item_class($this, $items[$key]);
176	+ $this->data['items'][] = new $this->item_class($this, $items[$key]);
177	}
178	}
179	if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'item'))
180	@@ -2979,7 +2979,7 @@
181	$keys = array_keys($items);
182	foreach ($keys as $key)
183	{
184	- $this->data['items'][] =& new $this->item_class($this, $items[$key]);
185	+ $this->data['items'][] = new $this->item_class($this, $items[$key]);
186	}
187	}
188	if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'item'))
189	@@ -2987,7 +2987,7 @@
190	$keys = array_keys($items);
191	foreach ($keys as $key)
192	{
193	- $this->data['items'][] =& new $this->item_class($this, $items[$key]);
194	+ $this->data['items'][] = new $this->item_class($this, $items[$key]);
195	}
196	}
197	if ($items = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'item'))
198	@@ -2995,7 +2995,7 @@
199	$keys = array_keys($items);
200	foreach ($keys as $key)
201	{
202	- $this->data['items'][] =& new $this->item_class($this, $items[$key]);
203	+ $this->data['items'][] = new $this->item_class($this, $items[$key]);
204	}
205	}
206	}
207	@@ -3346,7 +3346,7 @@
208	{
209	$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
210	}
211	- $categories[] =& new $this->feed->category_class($term, $scheme, $label);
212	+ $categories[] = new $this->feed->category_class($term, $scheme, $label);
213	}
214	foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'category') as $category)
215	{
216	@@ -3361,15 +3361,15 @@
217	{
218	$scheme = null;
219	}
220	- $categories[] =& new $this->feed->category_class($term, $scheme, null);
221	+ $categories[] = new $this->feed->category_class($term, $scheme, null);
222	}
223	foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'subject') as $category)
224	{
225	- $categories[] =& new $this->feed->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
226	+ $categories[] = new $this->feed->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
227	}
228	foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'subject') as $category)
229	{
230	- $categories[] =& new $this->feed->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
231	+ $categories[] = new $this->feed->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
232	}
233
234	if (!empty($categories))
235	@@ -3430,7 +3430,7 @@
236	}
237	if ($name !== null \|\| $email !== null \|\| $uri !== null)
238	{
239	- $contributors[] =& new $this->feed->author_class($name, $uri, $email);
240	+ $contributors[] = new $this->feed->author_class($name, $uri, $email);
241	}
242	}
243	foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'contributor') as $contributor)
244	@@ -3452,7 +3452,7 @@
245	}
246	if ($name !== null \|\| $email !== null \|\| $url !== null)
247	{
248	- $contributors[] =& new $this->feed->author_class($name, $url, $email);
249	+ $contributors[] = new $this->feed->author_class($name, $url, $email);
250	}
251	}
252
253	@@ -3488,7 +3488,7 @@
254	}
255	if ($name !== null \|\| $email !== null \|\| $uri !== null)
256	{
257	- $authors[] =& new $this->feed->author_class($name, $uri, $email);
258	+ $authors[] = new $this->feed->author_class($name, $uri, $email);
259	}
260	}
261	if ($author = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'author'))
262	@@ -3510,24 +3510,24 @@
263	}
264	if ($name !== null \|\| $email !== null \|\| $url !== null)
265	{
266	- $authors[] =& new $this->feed->author_class($name, $url, $email);
267	+ $authors[] = new $this->feed->author_class($name, $url, $email);
268	}
269	}
270	if ($author = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'author'))
271	{
272	- $authors[] =& new $this->feed->author_class(null, null, $this->sanitize($author[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
273	+ $authors[] = new $this->feed->author_class(null, null, $this->sanitize($author[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
274	}
275	foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'creator') as $author)
276	{
277	- $authors[] =& new $this->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
278	+ $authors[] = new $this->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
279	}
280	foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'creator') as $author)
281	{
282	- $authors[] =& new $this->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
283	+ $authors[] = new $this->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
284	}
285	foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'author') as $author)
286	{
287	- $authors[] =& new $this->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
288	+ $authors[] = new $this->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
289	}
290
291	if (!empty($authors))
292	@@ -3837,7 +3837,7 @@
293	{
294	$caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT);
295	}
296	- $captions_parent[] =& new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);
297	+ $captions_parent[] = new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);
298	}
299	}
300	elseif ($captions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'text'))
301	@@ -3869,7 +3869,7 @@
302	{
303	$caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT);
304	}
305	- $captions_parent[] =& new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);
306	+ $captions_parent[] = new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);
307	}
308	}
309	if (is_array($captions_parent))
310	@@ -3899,7 +3899,7 @@
311	{
312	$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
313	}
314	- $categories_parent[] =& new $this->feed->category_class($term, $scheme, $label);
315	+ $categories_parent[] = new $this->feed->category_class($term, $scheme, $label);
316	}
317	foreach ((array) $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'category') as $category)
318	{
319	@@ -3922,7 +3922,7 @@
320	{
321	$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
322	}
323	- $categories_parent[] =& new $this->feed->category_class($term, $scheme, $label);
324	+ $categories_parent[] = new $this->feed->category_class($term, $scheme, $label);
325	}
326	foreach ((array) $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'category') as $category)
327	{
328	@@ -3933,7 +3933,7 @@
329	{
330	$label = $this->sanitize($category['attribs']['']['text'], SIMPLEPIE_CONSTRUCT_TEXT);
331	}
332	- $categories_parent[] =& new $this->feed->category_class($term, $scheme, $label);
333	+ $categories_parent[] = new $this->feed->category_class($term, $scheme, $label);
334
335	if (isset($category['child'][SIMPLEPIE_NAMESPACE_ITUNES]['category']))
336	{
337	@@ -3943,7 +3943,7 @@
338	{
339	$label = $this->sanitize($subcategory['attribs']['']['text'], SIMPLEPIE_CONSTRUCT_TEXT);
340	}
341	- $categories_parent[] =& new $this->feed->category_class($term, $scheme, $label);
342	+ $categories_parent[] = new $this->feed->category_class($term, $scheme, $label);
343	}
344	}
345	}
346	@@ -3965,7 +3965,7 @@
347	{
348	$copyright_label = $this->sanitize($copyright[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
349	}
350	- $copyrights_parent =& new $this->feed->copyright_class($copyright_url, $copyright_label);
351	+ $copyrights_parent = new $this->feed->copyright_class($copyright_url, $copyright_label);
352	}
353	elseif ($copyright = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'copyright'))
354	{
355	@@ -3979,7 +3979,7 @@
356	{
357	$copyright_label = $this->sanitize($copyright[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
358	}
359	- $copyrights_parent =& new $this->feed->copyright_class($copyright_url, $copyright_label);
360	+ $copyrights_parent = new $this->feed->copyright_class($copyright_url, $copyright_label);
361	}
362
363	// CREDITS
364	@@ -4006,7 +4006,7 @@
365	{
366	$credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT);
367	}
368	- $credits_parent[] =& new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);
369	+ $credits_parent[] = new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);
370	}
371	}
372	elseif ($credits = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'credit'))
373	@@ -4032,7 +4032,7 @@
374	{
375	$credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT);
376	}
377	- $credits_parent[] =& new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);
378	+ $credits_parent[] = new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);
379	}
380	}
381	if (is_array($credits_parent))
382	@@ -4221,7 +4221,7 @@
383	{
384	$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
385	}
386	- $ratings_parent[] =& new $this->feed->rating_class($rating_scheme, $rating_value);
387	+ $ratings_parent[] = new $this->feed->rating_class($rating_scheme, $rating_value);
388	}
389	}
390	elseif ($ratings = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'explicit'))
391	@@ -4234,7 +4234,7 @@
392	{
393	$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
394	}
395	- $ratings_parent[] =& new $this->feed->rating_class($rating_scheme, $rating_value);
396	+ $ratings_parent[] = new $this->feed->rating_class($rating_scheme, $rating_value);
397	}
398	}
399	elseif ($ratings = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'rating'))
400	@@ -4255,7 +4255,7 @@
401	{
402	$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
403	}
404	- $ratings_parent[] =& new $this->feed->rating_class($rating_scheme, $rating_value);
405	+ $ratings_parent[] = new $this->feed->rating_class($rating_scheme, $rating_value);
406	}
407	}
408	elseif ($ratings = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'explicit'))
409	@@ -4268,7 +4268,7 @@
410	{
411	$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
412	}
413	- $ratings_parent[] =& new $this->feed->rating_class($rating_scheme, $rating_value);
414	+ $ratings_parent[] = new $this->feed->rating_class($rating_scheme, $rating_value);
415	}
416	}
417	if (is_array($ratings_parent))
418	@@ -4296,7 +4296,7 @@
419	{
420	$restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT);
421	}
422	- $restrictions_parent[] =& new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
423	+ $restrictions_parent[] = new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
424	}
425	}
426	elseif ($restrictions = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'block'))
427	@@ -4310,7 +4310,7 @@
428	{
429	$restriction_relationship = 'deny';
430	}
431	- $restrictions_parent[] =& new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
432	+ $restrictions_parent[] = new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
433	}
434	}
435	elseif ($restrictions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'restriction'))
436	@@ -4332,7 +4332,7 @@
437	{
438	$restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT);
439	}
440	- $restrictions_parent[] =& new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
441	+ $restrictions_parent[] = new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
442	}
443	}
444	elseif ($restrictions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'block'))
445	@@ -4346,7 +4346,7 @@
446	{
447	$restriction_relationship = 'deny';
448	}
449	- $restrictions_parent[] =& new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
450	+ $restrictions_parent[] = new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
451	}
452	}
453	if (is_array($restrictions_parent))
454	@@ -4550,7 +4550,7 @@
455	{
456	$caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT);
457	}
458	- $captions[] =& new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);
459	+ $captions[] = new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);
460	}
461	if (is_array($captions))
462	{
463	@@ -4586,7 +4586,7 @@
464	{
465	$caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT);
466	}
467	- $captions[] =& new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);
468	+ $captions[] = new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);
469	}
470	if (is_array($captions))
471	{
472	@@ -4622,7 +4622,7 @@
473	{
474	$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
475	}
476	- $categories[] =& new $this->feed->category_class($term, $scheme, $label);
477	+ $categories[] = new $this->feed->category_class($term, $scheme, $label);
478	}
479	}
480	if (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['category']))
481	@@ -4648,7 +4648,7 @@
482	{
483	$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
484	}
485	- $categories[] =& new $this->feed->category_class($term, $scheme, $label);
486	+ $categories[] = new $this->feed->category_class($term, $scheme, $label);
487	}
488	}
489	if (is_array($categories) && is_array($categories_parent))
490	@@ -4677,7 +4677,7 @@
491	{
492	$copyright_label = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
493	}
494	- $copyrights =& new $this->feed->copyright_class($copyright_url, $copyright_label);
495	+ $copyrights = new $this->feed->copyright_class($copyright_url, $copyright_label);
496	}
497	elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright']))
498	{
499	@@ -4691,7 +4691,7 @@
500	{
501	$copyright_label = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
502	}
503	- $copyrights =& new $this->feed->copyright_class($copyright_url, $copyright_label);
504	+ $copyrights = new $this->feed->copyright_class($copyright_url, $copyright_label);
505	}
506	else
507	{
508	@@ -4722,7 +4722,7 @@
509	{
510	$credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT);
511	}
512	- $credits[] =& new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);
513	+ $credits[] = new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);
514	}
515	if (is_array($credits))
516	{
517	@@ -4752,7 +4752,7 @@
518	{
519	$credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT);
520	}
521	- $credits[] =& new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);
522	+ $credits[] = new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);
523	}
524	if (is_array($credits))
525	{
526	@@ -4905,7 +4905,7 @@
527	{
528	$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
529	}
530	- $ratings[] =& new $this->feed->rating_class($rating_scheme, $rating_value);
531	+ $ratings[] = new $this->feed->rating_class($rating_scheme, $rating_value);
532	}
533	if (is_array($ratings))
534	{
535	@@ -4930,7 +4930,7 @@
536	{
537	$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
538	}
539	- $ratings[] =& new $this->feed->rating_class($rating_scheme, $rating_value);
540	+ $ratings[] = new $this->feed->rating_class($rating_scheme, $rating_value);
541	}
542	if (is_array($ratings))
543	{
544	@@ -4962,7 +4962,7 @@
545	{
546	$restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT);
547	}
548	- $restrictions[] =& new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
549	+ $restrictions[] = new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
550	}
551	if (is_array($restrictions))
552	{
553	@@ -4988,7 +4988,7 @@
554	{
555	$restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT);
556	}
557	- $restrictions[] =& new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
558	+ $restrictions[] = new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
559	}
560	if (is_array($restrictions))
561	{
562	@@ -5042,7 +5042,7 @@
563	$title = $title_parent;
564	}
565
566	- $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);
567	+ $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);
568	}
569	}
570	}
571	@@ -5171,7 +5171,7 @@
572	{
573	$caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT);
574	}
575	- $captions[] =& new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);
576	+ $captions[] = new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);
577	}
578	if (is_array($captions))
579	{
580	@@ -5207,7 +5207,7 @@
581	{
582	$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
583	}
584	- $categories[] =& new $this->feed->category_class($term, $scheme, $label);
585	+ $categories[] = new $this->feed->category_class($term, $scheme, $label);
586	}
587	}
588	if (is_array($categories) && is_array($categories_parent))
589	@@ -5240,7 +5240,7 @@
590	{
591	$copyright_label = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
592	}
593	- $copyrights =& new $this->feed->copyright_class($copyright_url, $copyright_label);
594	+ $copyrights = new $this->feed->copyright_class($copyright_url, $copyright_label);
595	}
596	else
597	{
598	@@ -5271,7 +5271,7 @@
599	{
600	$credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT);
601	}
602	- $credits[] =& new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);
603	+ $credits[] = new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);
604	}
605	if (is_array($credits))
606	{
607	@@ -5375,7 +5375,7 @@
608	{
609	$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
610	}
611	- $ratings[] =& new $this->feed->rating_class($rating_scheme, $rating_value);
612	+ $ratings[] = new $this->feed->rating_class($rating_scheme, $rating_value);
613	}
614	if (is_array($ratings))
615	{
616	@@ -5407,7 +5407,7 @@
617	{
618	$restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT);
619	}
620	- $restrictions[] =& new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
621	+ $restrictions[] = new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
622	}
623	if (is_array($restrictions))
624	{
625	@@ -5446,7 +5446,7 @@
626	$title = $title_parent;
627	}
628
629	- $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);
630	+ $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);
631	}
632	}
633	}
634	@@ -5482,7 +5482,7 @@
635	}
636
637	// Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor
638	- $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);
639	+ $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);
640	}
641	}
642
643	@@ -5517,7 +5517,7 @@
644	}
645
646	// Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor
647	- $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);
648	+ $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);
649	}
650	}
651
652	@@ -5552,14 +5552,14 @@
653	}
654
655	// Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor
656	- $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);
657	+ $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);
658	}
659	}
660
661	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))
662	{
663	// Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor
664	- $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);
665	+ $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);
666	}
667
668	$this->data['enclosures'] = array_values(SimplePie_Misc::array_unique($this->data['enclosures']));
669	@@ -5836,7 +5836,7 @@
670	{
671	$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
672	}
673	- $categories[] =& new $this->item->feed->category_class($term, $scheme, $label);
674	+ $categories[] = new $this->item->feed->category_class($term, $scheme, $label);
675	}
676	foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'category') as $category)
677	{
678	@@ -5851,15 +5851,15 @@
679	{
680	$scheme = null;
681	}
682	- $categories[] =& new $this->item->feed->category_class($term, $scheme, null);
683	+ $categories[] = new $this->item->feed->category_class($term, $scheme, null);
684	}
685	foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'subject') as $category)
686	{
687	- $categories[] =& new $this->item->feed->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
688	+ $categories[] = new $this->item->feed->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
689	}
690	foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'subject') as $category)
691	{
692	- $categories[] =& new $this->item->feed->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
693	+ $categories[] = new $this->item->feed->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
694	}
695
696	if (!empty($categories))
697	@@ -5907,7 +5907,7 @@
698	}
699	if ($name !== null \|\| $email !== null \|\| $uri !== null)
700	{
701	- $authors[] =& new $this->item->feed->author_class($name, $uri, $email);
702	+ $authors[] = new $this->item->feed->author_class($name, $uri, $email);
703	}
704	}
705	if ($author = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'author'))
706	@@ -5929,20 +5929,20 @@
707	}
708	if ($name !== null \|\| $email !== null \|\| $url !== null)
709	{
710	- $authors[] =& new $this->item->feed->author_class($name, $url, $email);
711	+ $authors[] = new $this->item->feed->author_class($name, $url, $email);
712	}
713	}
714	foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'creator') as $author)
715	{
716	- $authors[] =& new $this->item->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
717	+ $authors[] = new $this->item->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
718	}
719	foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'creator') as $author)
720	{
721	- $authors[] =& new $this->item->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
722	+ $authors[] = new $this->item->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
723	}
724	foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'author') as $author)
725	{
726	- $authors[] =& new $this->item->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
727	+ $authors[] = new $this->item->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
728	}
729
730	if (!empty($authors))
731	@@ -5990,7 +5990,7 @@
732	}
733	if ($name !== null \|\| $email !== null \|\| $uri !== null)
734	{
735	- $contributors[] =& new $this->item->feed->author_class($name, $uri, $email);
736	+ $contributors[] = new $this->item->feed->author_class($name, $uri, $email);
737	}
738	}
739	foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'contributor') as $contributor)
740	@@ -6012,7 +6012,7 @@
741	}
742	if ($name !== null \|\| $email !== null \|\| $url !== null)
743	{
744	- $contributors[] =& new $this->item->feed->author_class($name, $url, $email);
745	+ $contributors[] = new $this->item->feed->author_class($name, $url, $email);
746	}
747	}
748
749	@@ -6449,7 +6449,7 @@
750	$this->width = $width;
751	if (class_exists('idna_convert'))
752	{
753	- $idn =& new idna_convert;
754	+ $idn = new idna_convert;
755	$parsed = SimplePie_Misc::parse_url($link);
756	$this->link = SimplePie_Misc::compress_parse_url($parsed['scheme'], $idn->encode($parsed['authority']), $parsed['path'], $parsed['query'], $parsed['fragment']);
757	}
758	@@ -7647,7 +7647,7 @@
759	{
760	if (class_exists('idna_convert'))
761	{
762	- $idn =& new idna_convert;
763	+ $idn = new idna_convert;
764	$parsed = SimplePie_Misc::parse_url($url);
765	$url = SimplePie_Misc::compress_parse_url($parsed['scheme'], $idn->encode($parsed['authority']), $parsed['path'], $parsed['query'], $parsed['fragment']);
766	}
767	@@ -7708,7 +7708,7 @@
768	curl_close($fp);
769	$this->headers = explode("\r\n\r\n", $this->headers, $info['redirect_count'] + 1);
770	$this->headers = array_pop($this->headers);
771	- $parser =& new SimplePie_HTTP_Parser($this->headers);
772	+ $parser = new SimplePie_HTTP_Parser($this->headers);
773	if ($parser->parse())
774	{
775	$this->headers = $parser->headers;
776	@@ -7789,7 +7789,7 @@
777	}
778	if (!$info['timed_out'])
779	{
780	- $parser =& new SimplePie_HTTP_Parser($this->headers);
781	+ $parser = new SimplePie_HTTP_Parser($this->headers);
782	if ($parser->parse())
783	{
784	$this->headers = $parser->headers;
785	@@ -7808,7 +7808,7 @@
786	{
787	case 'gzip':
788	case 'x-gzip':
789	- $decoder =& new SimplePie_gzdecode($this->body);
790	+ $decoder = new SimplePie_gzdecode($this->body);
791	if (!$decoder->parse())
792	{
793	$this->error = 'Unable to decode HTTP "gzip" stream';
794	@@ -8620,7 +8620,7 @@
795	*/
796	function create($location, $filename, $extension)
797	{
798	- $location_iri =& new SimplePie_IRI($location);
799	+ $location_iri = new SimplePie_IRI($location);
800	switch ($location_iri->get_scheme())
801	{
802	case 'mysql':
803	@@ -9317,7 +9317,7 @@
804
805	function parse_url($url)
806	{
807	- $iri =& new SimplePie_IRI($url);
808	+ $iri = new SimplePie_IRI($url);
809	return array(
810	'scheme' => (string) $iri->get_scheme(),
811	'authority' => (string) $iri->get_authority(),
812	@@ -9329,7 +9329,7 @@
813
814	function compress_parse_url($scheme = '', $authority = '', $path = '', $query = '', $fragment = '')
815	{
816	- $iri =& new SimplePie_IRI('');
817	+ $iri = new SimplePie_IRI('');
818	$iri->set_scheme($scheme);
819	$iri->set_authority($authority);
820	$iri->set_path($path);
821	@@ -9340,7 +9340,7 @@
822
823	function normalize_url($url)
824	{
825	- $iri =& new SimplePie_IRI($url);
826	+ $iri = new SimplePie_IRI($url);
827	return $iri->get_iri();
828	}
829
830	@@ -10860,7 +10860,7 @@
831	*/
832	function entities_decode($data)
833	{
834	- $decoder =& new SimplePie_Decode_HTML_Entities($data);
835	+ $decoder = new SimplePie_Decode_HTML_Entities($data);
836	return $decoder->parse();
837	}
838
839	@@ -11256,7 +11256,7 @@
840	{
841	if ($pos = strpos($data, "\x00\x00\x00\x3F\x00\x00\x00\x3E"))
842	{
843	- $parser =& new SimplePie_XML_Declaration_Parser(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 20), 'UTF-32BE', 'UTF-8'));
844	+ $parser = new SimplePie_XML_Declaration_Parser(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 20), 'UTF-32BE', 'UTF-8'));
845	if ($parser->parse())
846	{
847	$encoding[] = $parser->encoding;
848	@@ -11269,7 +11269,7 @@
849	{
850	if ($pos = strpos($data, "\x3F\x00\x00\x00\x3E\x00\x00\x00"))
851	{
852	- $parser =& new SimplePie_XML_Declaration_Parser(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 20), 'UTF-32LE', 'UTF-8'));
853	+ $parser = new SimplePie_XML_Declaration_Parser(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 20), 'UTF-32LE', 'UTF-8'));
854	if ($parser->parse())
855	{
856	$encoding[] = $parser->encoding;
857	@@ -11282,7 +11282,7 @@
858	{
859	if ($pos = strpos($data, "\x00\x3F\x00\x3E"))
860	{
861	- $parser =& new SimplePie_XML_Declaration_Parser(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 10), 'UTF-16BE', 'UTF-8'));
862	+ $parser = new SimplePie_XML_Declaration_Parser(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 10), 'UTF-16BE', 'UTF-8'));
863	if ($parser->parse())
864	{
865	$encoding[] = $parser->encoding;
866	@@ -11295,7 +11295,7 @@
867	{
868	if ($pos = strpos($data, "\x3F\x00\x3E\x00"))
869	{
870	- $parser =& new SimplePie_XML_Declaration_Parser(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 10), 'UTF-16LE', 'UTF-8'));
871	+ $parser = new SimplePie_XML_Declaration_Parser(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 10), 'UTF-16LE', 'UTF-8'));
872	if ($parser->parse())
873	{
874	$encoding[] = $parser->encoding;
875	@@ -11308,7 +11308,7 @@
876	{
877	if ($pos = strpos($data, "\x3F\x3E"))
878	{
879	- $parser =& new SimplePie_XML_Declaration_Parser(substr($data, 5, $pos - 5));
880	+ $parser = new SimplePie_XML_Declaration_Parser(substr($data, 5, $pos - 5));
881	if ($parser->parse())
882	{
883	$encoding[] = $parser->encoding;
884	@@ -11683,7 +11683,7 @@
885	$relative = (string) $relative;
886	if ($relative !== '')
887	{
888	- $relative =& new SimplePie_IRI($relative);
889	+ $relative = new SimplePie_IRI($relative);
890	if ($relative->get_scheme() !== null)
891	{
892	$target = $relative;
893	@@ -11697,7 +11697,7 @@
894	}
895	else
896	{
897	- $target =& new SimplePie_IRI('');
898	+ $target = new SimplePie_IRI('');
899	$target->set_scheme($base->get_scheme());
900	$target->set_userinfo($base->get_userinfo());
901	$target->set_host($base->get_host());
902	@@ -13049,7 +13049,7 @@
903	static $object;
904	if (!$object)
905	{
906	- $object =& new SimplePie_Parse_Date;
907	+ $object = new SimplePie_Parse_Date;
908	}
909	return $object;
910	}
911	@@ -14084,7 +14084,7 @@
912
913	if ($this->file->method & SIMPLEPIE_FILE_SOURCE_REMOTE)
914	{
915	- $sniffer =& new $this->content_type_sniffer_class($this->file);
916	+ $sniffer = new $this->content_type_sniffer_class($this->file);
917	if ($sniffer->get_type() !== 'text/html')
918	{
919	return null;
920	@@ -14130,7 +14130,7 @@
921	{
922	if ($file->method & SIMPLEPIE_FILE_SOURCE_REMOTE)
923	{
924	- $sniffer =& new $this->content_type_sniffer_class($file);
925	+ $sniffer = new $this->content_type_sniffer_class($file);
926	$sniffed = $sniffer->get_type();
927	if (in_array($sniffed, array('application/rss+xml', 'application/rdf+xml', 'text/rdf', 'application/atom+xml', 'text/xml', 'application/xml')))
928	{
929	@@ -14194,7 +14194,7 @@
930	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]))
931	{
932	$this->checked_feeds++;
933	- $feed =& new $this->file_class($href, $this->timeout, 5, null, $this->useragent);
934	+ $feed = new $this->file_class($href, $this->timeout, 5, null, $this->useragent);
935	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))
936	{
937	$feeds[$href] = $feed;
938	@@ -14266,7 +14266,7 @@
939	if (in_array(strtolower(strrchr($value, '.')), array('.rss', '.rdf', '.atom', '.xml')))
940	{
941	$this->checked_feeds++;
942	- $feed =& new $this->file_class($value, $this->timeout, 5, null, $this->useragent);
943	+ $feed = new $this->file_class($value, $this->timeout, 5, null, $this->useragent);
944	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))
945	{
946	return $feed;
947	@@ -14291,7 +14291,7 @@
948	if (preg_match('/(rss\|rdf\|atom\|xml)/i', $value))
949	{
950	$this->checked_feeds++;
951	- $feed =& new $this->file_class($value, $this->timeout, 5, null, $this->useragent);
952	+ $feed = new $this->file_class($value, $this->timeout, 5, null, $this->useragent);
953	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))
954	{
955	return $feed;
956	@@ -14365,7 +14365,7 @@
957
958	if (substr($data, 0, 5) === '<?xml' && strspn(substr($data, 5, 1), "\x09\x0A\x0D\x20") && ($pos = strpos($data, '?>')) !== false)
959	{
960	- $declaration =& new SimplePie_XML_Declaration_Parser(substr($data, 5, $pos - 5));
961	+ $declaration = new SimplePie_XML_Declaration_Parser(substr($data, 5, $pos - 5));
962	if ($declaration->parse())
963	{
964	$data = substr($data, $pos + 2);
965	@@ -14415,7 +14415,7 @@
966	else
967	{
968	libxml_clear_errors();
969	- $xml =& new XMLReader();
970	+ $xml = new XMLReader();
971	$xml->xml($data);
972	while (@$xml->read())
973	{
974	@@ -14901,7 +14901,7 @@
975	}
976	else
977	{
978	- $file =& new $this->file_class($img['attribs']['src']['data'], $this->timeout, 5, array('X-FORWARDED-FOR' => $_SERVER['REMOTE_ADDR']), $this->useragent, $this->force_fsockopen);
979	+ $file = new $this->file_class($img['attribs']['src']['data'], $this->timeout, 5, array('X-FORWARDED-FOR' => $_SERVER['REMOTE_ADDR']), $this->useragent, $this->force_fsockopen);
980	$headers = $file->headers;
981
982	if ($file->success && ($file->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 \|\| ($file->status_code === 200 \|\| $file->status_code > 206 && $file->status_code < 300)))

Download in other formats:

Original Format