HostForge-Systems/wordpress
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Constructor cleanup. Props ocean90. fixes #16768

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@17771 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan
2011-04-29 20:05:12 +00:00
parent e0ffff9fb5
commit 04487fc268
33 changed files with 54 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
wp-includes/class-feed.php
View File

@@ -4,15 +4,6 @@ if ( !class_exists('SimplePie') )
require_once (ABSPATH . WPINC . '/class-simplepie.php');
class WP_Feed_Cache extends SimplePie_Cache {
/**
* Don't call the constructor. Please.
*
* @access private
*/
function WP_Feed_Cache() {
trigger_error('Please call SimplePie_Cache::create() instead of the constructor', E_USER_ERROR);
}
/**
* Create a new SimplePie_Cache object
*
@@ -29,7 +20,7 @@ class WP_Feed_Cache_Transient {
var $mod_name;
var $lifetime = 43200; //Default lifetime in cache of 12 hours
function WP_Feed_Cache_Transient($location, $filename, $extension) {
function __construct($location, $filename, $extension) {
$this->name = 'feed_' . $filename;
$this->mod_name = 'feed_mod_' . $filename;
$this->lifetime = apply_filters('wp_feed_cache_transient_lifetime', $this->lifetime, $filename);
@@ -65,7 +56,7 @@ class WP_Feed_Cache_Transient {
class WP_SimplePie_File extends SimplePie_File {
function WP_SimplePie_File($url, $timeout = 10, $redirects = 5, $headers = null, $useragent = null, $force_fsockopen = false) {
function __construct($url, $timeout = 10, $redirects = 5, $headers = null, $useragent = null, $force_fsockopen = false) {
$this->url = $url;
$this->timeout = $timeout;
$this->redirects = $redirects;