mirror of
https://github.com/moodle/moodle.git
synced 2025-04-13 20:42:22 +02:00
MDL-29878 reapply our typo3 fixes
This commit is contained in:
parent
2c5b848872
commit
29329a2519
@ -221,7 +221,7 @@
|
||||
<location>typo3</location>
|
||||
<name>Typo3</name>
|
||||
<license>GPL</license>
|
||||
<version>4.2.1</version>
|
||||
<version>4.5.0</version>
|
||||
<licenseversion>2.0+</licenseversion>
|
||||
</library>
|
||||
<library>
|
||||
|
@ -1028,7 +1028,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';
|
||||
|
@ -2989,7 +2989,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)) {
|
||||
|
@ -1,8 +1,12 @@
|
||||
Description of Typo3 libraries (v 4.3.0RC1) import into Moodle
|
||||
Description of Typo3 libraries (v 4.5.0) import into Moodle
|
||||
|
||||
skodak, stronk7
|
||||
|
||||
|
||||
25 June 2010 - Martin D
|
||||
25 June 2010 - Martin D (4.3.0RC1)
|
||||
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
|
||||
|
||||
22 October 2011 - Petr Skoda (4.5.0)
|
||||
reapplied getURL --> getUrl in class.t3lib_div.php line 2992
|
||||
reintroduced check to avoid notices on class.t3lib_cs.php line 1031
|
||||
|
Loading…
x
Reference in New Issue
Block a user