From: poltawski Date: Mon, 13 Apr 2009 16:00:44 +0000 (+0000) Subject: simplepie: fix class name caseing: MDL-7946, MDL-13932 X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=668fa0d667421bf45af1e7c7c5803d16e5a9e74b;p=moodle.git simplepie: fix class name caseing: MDL-7946, MDL-13932 --- diff --git a/lib/simplepie/moodle_simplepie.php b/lib/simplepie/moodle_simplepie.php index 4d415b1cf6..0c627fa91d 100644 --- a/lib/simplepie/moodle_simplepie.php +++ b/lib/simplepie/moodle_simplepie.php @@ -42,13 +42,13 @@ require_once($CFG->libdir.'/simplepie/simplepie.inc'); * curl functions/proxy config for making http * requests. */ -class Moodle_SimplePie extends SimplePie +class moodle_simplepie extends SimplePie { function __construct($feed_url = null){ global $CFG; // Use the Moodle class for http requests - $this->file_class = 'Moodle_SimplePie_File'; + $this->file_class = 'moodle_simplepie_file'; // Use sensible cache directory $cachedir = $CFG->dataroot.'/cache/simplepie/'; @@ -69,7 +69,7 @@ class Moodle_SimplePie extends SimplePie * http requests. By using the moodle curl class * we ensure that the correct proxy configuration is used. */ -class Moodle_SimplePie_File extends SimplePie_File +class moodle_simplepie_file extends SimplePie_File { /** @@ -77,7 +77,7 @@ class Moodle_SimplePie_File extends SimplePie_File * been modifed to add in use the Moodle curl class rather than php curl * functions. */ - function Moodle_SimplePie_File($url, $timeout = 10, $redirects = 5, $headers = null, $useragent = null, $force_fsockopen = false) + function moodle_simplepie_file($url, $timeout = 10, $redirects = 5, $headers = null, $useragent = null, $force_fsockopen = false) { $this->url = $url; $this->method = SIMPLEPIE_FILE_SOURCE_REMOTE | SIMPLEPIE_FILE_SOURCE_CURL; diff --git a/lib/simpletest/testrss.php b/lib/simpletest/testrss.php index 7d914008e6..fbe8b7c570 100644 --- a/lib/simpletest/testrss.php +++ b/lib/simpletest/testrss.php @@ -17,9 +17,9 @@ class moodlesimplepie_test extends UnitTestCase { var $testurl = 'http://download.moodle.org/unittest/rsstest.xml'; function test_getfeed(){ - $feed = new Moodle_Simplepie($this->testurl); + $feed = new moodle_simplepie($this->testurl); - $this->assertIsA($feed, 'Moodle_SimplePie'); + $this->assertIsA($feed, 'moodle_simplepie'); $this->assertFalse($feed->error()); @@ -68,7 +68,7 @@ EOD; } function test_failfeed(){ - $feed = new Moodle_Simplepie('http://111xxxxxxxxxxxxxmoodle.org/'); + $feed = new moodle_simplepie('http://111xxxxxxxxxxxxxmoodle.org/'); $this->assertTrue($feed->error()); }