MDL-32094 fix various E_STRICT compatibility problems

This commit is contained in:
Petr Skoda 2012-03-18 18:37:24 +01:00
parent 0ed6f71232
commit f20edd5208
27 changed files with 53 additions and 42 deletions

View file

@ -289,7 +289,7 @@ class csv_import_reader {
* @param string separator name
* @return string encoded delimiter char
*/
function get_encoded_delimiter($delimiter_name) {
static function get_encoded_delimiter($delimiter_name) {
global $CFG;
if ($delimiter_name == 'cfg' and isset($CFG->CSV_ENCODE)) {
return $CFG->CSV_ENCODE;
@ -305,7 +305,7 @@ class csv_import_reader {
* @param string who imports?
* @return int iid
*/
function get_new_iid($type) {
static function get_new_iid($type) {
global $USER;
$filename = make_temp_directory('csvimport/'.$type.'/'.$USER->id);