From: Jure Kajzer Date: Fri, 27 Nov 2009 13:44:57 +0000 (+0000) Subject: Fixed wrong field definition for filearchive. Fixed delete function to handle encodin... X-Git-Tag: 1.31.0-rc.0~38698 X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=f46754821ad0b952d9238c7f862dba96513eeab2;p=lhc%2Fweb%2Fwiklou.git Fixed wrong field definition for filearchive. Fixed delete function to handle encoding checking of array values in condition. --- diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php index 794186dd68..b35035b1e2 100644 --- a/includes/db/DatabaseOracle.php +++ b/includes/db/DatabaseOracle.php @@ -1058,7 +1058,13 @@ class DatabaseOracle extends DatabaseBase { if ($col_type == 'CLOB') $conds2['TO_CHAR('.$col.')'] = $wgLang->checkTitleEncoding($val); else - $conds2[$col] = $wgLang->checkTitleEncoding($val); + if (is_array($val)) { + $conds2[$col] = $val; + foreach($conds2[$col] as &$val2) + $val2 = $wgLang->checkTitleEncoding($val2); + } else { + $conds2[$col] = $wgLang->checkTitleEncoding($val); + } } return parent::delete( $table, $conds2, $fname ); diff --git a/maintenance/ora/tables.sql b/maintenance/ora/tables.sql index c300e939b1..f21ad0b4ae 100644 --- a/maintenance/ora/tables.sql +++ b/maintenance/ora/tables.sql @@ -302,7 +302,7 @@ CREATE TABLE &mw_prefix.filearchive ( fa_media_type VARCHAR2(32) DEFAULT NULL, fa_major_mime VARCHAR2(32) DEFAULT 'unknown', fa_minor_mime VARCHAR2(32) DEFAULT 'unknown', - fa_description VARCHAR2(255) NOT NULL, + fa_description VARCHAR2(255), fa_user NUMBER NULL REFERENCES &mw_prefix.mwuser(user_id) ON DELETE SET NULL, fa_user_text VARCHAR2(255) NOT NULL, fa_timestamp TIMESTAMP(6) WITH TIME ZONE,