mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 20:42:22 +02:00
Code Issues Projects Releases Wiki Activity

MDL-22922 Some hacks to prevent typo3 notices

Browse Source
This commit is contained in:
Martin Dougiamas 2010-06-25 03:09:53 +00:00
parent f233784d03
commit ab995c6cb9
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/typo3/class.t3lib_cs.php
View File

@ -973,7 +973,7 @@ class t3lib_cs {
*/
function initCharset($charset) {
// Only process if the charset is not yet loaded:
if (!is_array($this->parsedCharsets[$charset])) {
if (empty($this->parsedCharsets[$charset]) || !is_array($this->parsedCharsets[$charset])) {
// Conversion table filename:
$charsetConvTableFile = PATH_t3lib.'csconvtbl/'.$charset.'.tbl';
@ -2207,4 +2207,4 @@ if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class
include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_cs.php']);
}
?>
?>

6
lib/typo3/class.t3lib_div.php
View File

@ -129,7 +129,7 @@
* 2242: function xmlGetHeaderAttribs($xmlData)
*
* SECTION: FILES FUNCTIONS
* 2275: function getURL($url, $includeHeader=0)
* 2275: function getUrl($url, $includeHeader=0)
* 2342: function writeFile($file,$content)
* 2367: function fixPermissions($file)
* 2384: function writeFileToTypo3tempDir($filepath,$content)
@ -2705,7 +2705,7 @@ final class t3lib_div {
* @param array Error code/message and, if $includeHeader is 1, response meta data (HTTP status and content type)
* @return string The content from the resource given as input. FALSE if an error has occured.
*/
public static function getURL($url, $includeHeader = 0, $requestHeaders = false, &$report = NULL) {
public static function getUrl($url, $includeHeader = 0, $requestHeaders = false, &$report = NULL) {
$content = false;
if (isset($report)) {
@ -5713,4 +5713,4 @@ final class t3lib_div {
}
}
?>
?>

4
lib/typo3/readme_moodle.txt
View File

@ -2,3 +2,7 @@ Description of Typo3 libraries (v 4.3.0RC1) import into Moodle
skodak, stronk7
25 June 2010 - Martin D
I renamed getURL to getUrl since it was being called that way everywhere.
I added a check to avoid notices on lib/typo3/class.t3lib_cs.php line 976