Ticket #10222: 10222.diff
File 10222.diff, 5.1 KB (added by , 16 years ago) |
---|
-
wp-includes/class-simplepie.php
1686 1686 1687 1687 $headers = $file->headers; 1688 1688 $data = $file->body; 1689 $sniffer = new $this->content_type_sniffer_class($file);1689 $sniffer =& new $this->content_type_sniffer_class($file); 1690 1690 $sniffed = $sniffer->get_type(); 1691 1691 } 1692 1692 else … … 1964 1964 1965 1965 if ($file->success && ($file->status_code == 200 || ($file->status_code > 206 && $file->status_code < 300)) && strlen($file->body) > 0) 1966 1966 { 1967 $sniffer = new $this->content_type_sniffer_class($file);1967 $sniffer =& new $this->content_type_sniffer_class($file); 1968 1968 if (substr($sniffer->get_type(), 0, 6) === 'image/') 1969 1969 { 1970 1970 if ($cache->save(array('headers' => $file->headers, 'body' => $file->body))) … … 7744 7744 { 7745 7745 case 'gzip': 7746 7746 case 'x-gzip': 7747 $decoder = new SimplePie_gzdecode($this->body);7747 $decoder =& new SimplePie_gzdecode($this->body); 7748 7748 if (!$decoder->parse()) 7749 7749 { 7750 7750 $this->error = 'Unable to decode HTTP "gzip" stream'; … … 10542 10542 */ 10543 10543 function entities_decode($data) 10544 10544 { 10545 $decoder = new SimplePie_Decode_HTML_Entities($data);10545 $decoder =& new SimplePie_Decode_HTML_Entities($data); 10546 10546 return $decoder->parse(); 10547 10547 } 10548 10548 … … 10938 10938 { 10939 10939 if ($pos = strpos($data, "\x00\x00\x00\x3F\x00\x00\x00\x3E")) 10940 10940 { 10941 $parser = new SimplePie_XML_Declaration_Parser(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 20), 'UTF-32BE', 'UTF-8'));10941 $parser =& new SimplePie_XML_Declaration_Parser(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 20), 'UTF-32BE', 'UTF-8')); 10942 10942 if ($parser->parse()) 10943 10943 { 10944 10944 $encoding[] = $parser->encoding; … … 10951 10951 { 10952 10952 if ($pos = strpos($data, "\x3F\x00\x00\x00\x3E\x00\x00\x00")) 10953 10953 { 10954 $parser = new SimplePie_XML_Declaration_Parser(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 20), 'UTF-32LE', 'UTF-8'));10954 $parser =& new SimplePie_XML_Declaration_Parser(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 20), 'UTF-32LE', 'UTF-8')); 10955 10955 if ($parser->parse()) 10956 10956 { 10957 10957 $encoding[] = $parser->encoding; … … 10964 10964 { 10965 10965 if ($pos = strpos($data, "\x00\x3F\x00\x3E")) 10966 10966 { 10967 $parser = new SimplePie_XML_Declaration_Parser(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 10), 'UTF-16BE', 'UTF-8'));10967 $parser =& new SimplePie_XML_Declaration_Parser(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 10), 'UTF-16BE', 'UTF-8')); 10968 10968 if ($parser->parse()) 10969 10969 { 10970 10970 $encoding[] = $parser->encoding; … … 10977 10977 { 10978 10978 if ($pos = strpos($data, "\x3F\x00\x3E\x00")) 10979 10979 { 10980 $parser = new SimplePie_XML_Declaration_Parser(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 10), 'UTF-16LE', 'UTF-8'));10980 $parser =& new SimplePie_XML_Declaration_Parser(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 10), 'UTF-16LE', 'UTF-8')); 10981 10981 if ($parser->parse()) 10982 10982 { 10983 10983 $encoding[] = $parser->encoding; … … 10990 10990 { 10991 10991 if ($pos = strpos($data, "\x3F\x3E")) 10992 10992 { 10993 $parser = new SimplePie_XML_Declaration_Parser(substr($data, 5, $pos - 5));10993 $parser =& new SimplePie_XML_Declaration_Parser(substr($data, 5, $pos - 5)); 10994 10994 if ($parser->parse()) 10995 10995 { 10996 10996 $encoding[] = $parser->encoding; … … 11718 11718 { 11719 11719 if (extension_loaded('Reflection')) 11720 11720 { 11721 $class = new ReflectionClass(get_class($this));11721 $class =& new ReflectionClass(get_class($this)); 11722 11722 $methods = $class->getMethods(); 11723 11723 $all_methods = array(); 11724 foreach ($methods as $method)11724 foreach ($methods as &$method) 11725 11725 { 11726 11726 $all_methods[] = $method->getName(); 11727 11727 } … … 11756 11756 static $object; 11757 11757 if (!$object) 11758 11758 { 11759 $object = new SimplePie_Parse_Date;11759 $object =& new SimplePie_Parse_Date; 11760 11760 } 11761 11761 return $object; 11762 11762 } … … 12791 12791 12792 12792 if ($this->file->method & SIMPLEPIE_FILE_SOURCE_REMOTE) 12793 12793 { 12794 $sniffer = new $this->content_type_sniffer_class($this->file);12794 $sniffer =& new $this->content_type_sniffer_class($this->file); 12795 12795 if ($sniffer->get_type() !== 'text/html') 12796 12796 { 12797 12797 return null; … … 12837 12837 { 12838 12838 if ($file->method & SIMPLEPIE_FILE_SOURCE_REMOTE) 12839 12839 { 12840 $sniffer = new $this->content_type_sniffer_class($file);12840 $sniffer =& new $this->content_type_sniffer_class($file); 12841 12841 $sniffed = $sniffer->get_type(); 12842 12842 if (in_array($sniffed, array('application/rss+xml', 'application/rdf+xml', 'text/rdf', 'application/atom+xml', 'text/xml', 'application/xml'))) 12843 12843 { … … 13065 13065 13066 13066 if (substr($data, 0, 5) === '<?xml' && strspn(substr($data, 5, 1), "\x09\x0A\x0D\x20") && ($pos = strpos($data, '?>')) !== false) 13067 13067 { 13068 $declaration = new SimplePie_XML_Declaration_Parser(substr($data, 5, $pos - 5));13068 $declaration =& new SimplePie_XML_Declaration_Parser(substr($data, 5, $pos - 5)); 13069 13069 if ($declaration->parse()) 13070 13070 { 13071 13071 $data = substr($data, $pos + 2);