| Index: trunk/phase3/includes/db/DatabaseOracle.php |
| — | — | @@ -457,7 +457,7 @@ |
| 458 | 458 | } |
| 459 | 459 | |
| 460 | 460 | private function insertOneRow( $table, $row, $fname ) { |
| 461 | | - global $wgLang; |
| | 461 | + global $wgContLang; |
| 462 | 462 | |
| 463 | 463 | $table = $this->tableName( $table ); |
| 464 | 464 | // "INSERT INTO tables (a, b, c)" |
| — | — | @@ -493,7 +493,7 @@ |
| 494 | 494 | $val = '31-12-2030 12:00:00.000000'; |
| 495 | 495 | } |
| 496 | 496 | |
| 497 | | - $val = ( $wgLang != null ) ? $wgLang->checkTitleEncoding( $val ) : $val; |
| | 497 | + $val = ( $wgContLang != null ) ? $wgContLang->checkTitleEncoding( $val ) : $val; |
| 498 | 498 | if ( oci_bind_by_name( $stmt, ":$col", $val ) === false ) { |
| 499 | 499 | $this->reportQueryError( $this->lastErrno(), $this->lastError(), $sql, __METHOD__ ); |
| 500 | 500 | return false; |
| — | — | @@ -1028,9 +1028,9 @@ |
| 1029 | 1029 | } |
| 1030 | 1030 | |
| 1031 | 1031 | function addQuotes( $s ) { |
| 1032 | | - global $wgLang; |
| 1033 | | - if ( isset( $wgLang->mLoaded ) && $wgLang->mLoaded ) { |
| 1034 | | - $s = $wgLang->checkTitleEncoding( $s ); |
| | 1032 | + global $wgContLang; |
| | 1033 | + if ( isset( $wgContLang->mLoaded ) && $wgContLang->mLoaded ) { |
| | 1034 | + $s = $wgContLang->checkTitleEncoding( $s ); |
| 1035 | 1035 | } |
| 1036 | 1036 | return "'" . $this->strencode( $s ) . "'"; |
| 1037 | 1037 | } |
| — | — | @@ -1040,7 +1040,7 @@ |
| 1041 | 1041 | } |
| 1042 | 1042 | |
| 1043 | 1043 | function selectRow( $table, $vars, $conds, $fname = 'DatabaseOracle::selectRow', $options = array(), $join_conds = array() ) { |
| 1044 | | - global $wgLang; |
| | 1044 | + global $wgContLang; |
| 1045 | 1045 | |
| 1046 | 1046 | $conds2 = array(); |
| 1047 | 1047 | $conds = ($conds != null && !is_array($conds)) ? array($conds) : $conds; |
| — | — | @@ -1048,9 +1048,9 @@ |
| 1049 | 1049 | $col_info = $this->fieldInfoMulti( $table, $col ); |
| 1050 | 1050 | $col_type = $col_info != false ? $col_info->type() : 'CONSTANT'; |
| 1051 | 1051 | if ( $col_type == 'CLOB' ) { |
| 1052 | | - $conds2['TO_CHAR(' . $col . ')'] = $wgLang->checkTitleEncoding( $val ); |
| | 1052 | + $conds2['TO_CHAR(' . $col . ')'] = $wgContLang->checkTitleEncoding( $val ); |
| 1053 | 1053 | } elseif ( $col_type == 'VARCHAR2' && !mb_check_encoding( $val ) ) { |
| 1054 | | - $conds2[$col] = $wgLang->checkTitleEncoding( $val ); |
| | 1054 | + $conds2[$col] = $wgContLang->checkTitleEncoding( $val ); |
| 1055 | 1055 | } else { |
| 1056 | 1056 | $conds2[$col] = $val; |
| 1057 | 1057 | } |
| — | — | @@ -1103,24 +1103,24 @@ |
| 1104 | 1104 | } |
| 1105 | 1105 | |
| 1106 | 1106 | public function delete( $table, $conds, $fname = 'DatabaseOracle::delete' ) { |
| 1107 | | - global $wgLang; |
| | 1107 | + global $wgContLang; |
| 1108 | 1108 | |
| 1109 | | - if ( $wgLang != null ) { |
| | 1109 | + if ( $wgContLang != null ) { |
| 1110 | 1110 | $conds2 = array(); |
| 1111 | 1111 | $conds = ($conds != null && !is_array($conds)) ? array($conds) : $conds; |
| 1112 | 1112 | foreach ( $conds as $col => $val ) { |
| 1113 | 1113 | $col_info = $this->fieldInfoMulti( $table, $col ); |
| 1114 | 1114 | $col_type = $col_info != false ? $col_info->type() : 'CONSTANT'; |
| 1115 | 1115 | if ( $col_type == 'CLOB' ) { |
| 1116 | | - $conds2['TO_CHAR(' . $col . ')'] = $wgLang->checkTitleEncoding( $val ); |
| | 1116 | + $conds2['TO_CHAR(' . $col . ')'] = $wgContLang->checkTitleEncoding( $val ); |
| 1117 | 1117 | } else { |
| 1118 | 1118 | if ( is_array( $val ) ) { |
| 1119 | 1119 | $conds2[$col] = $val; |
| 1120 | 1120 | foreach ( $conds2[$col] as &$val2 ) { |
| 1121 | | - $val2 = $wgLang->checkTitleEncoding( $val2 ); |
| | 1121 | + $val2 = $wgContLang->checkTitleEncoding( $val2 ); |
| 1122 | 1122 | } |
| 1123 | 1123 | } else { |
| 1124 | | - $conds2[$col] = $wgLang->checkTitleEncoding( $val ); |
| | 1124 | + $conds2[$col] = $wgContLang->checkTitleEncoding( $val ); |
| 1125 | 1125 | } |
| 1126 | 1126 | } |
| 1127 | 1127 | } |
| Index: trunk/phase3/includes/api/ApiQuerySiteinfo.php |
| — | — | @@ -99,7 +99,7 @@ |
| 100 | 100 | } |
| 101 | 101 | |
| 102 | 102 | protected function appendGeneralInfo( $property ) { |
| 103 | | - global $wgContLang, $wgLang; |
| | 103 | + global $wgContLang; |
| 104 | 104 | |
| 105 | 105 | $data = array(); |
| 106 | 106 | $mainPage = Title::newMainPage(); |
| — | — | @@ -128,7 +128,7 @@ |
| 129 | 129 | if ( $wgContLang->isRTL() ) { |
| 130 | 130 | $data['rtl'] = ''; |
| 131 | 131 | } |
| 132 | | - $data['fallback8bitEncoding'] = $wgLang->fallback8bitEncoding(); |
| | 132 | + $data['fallback8bitEncoding'] = $wgContLang->fallback8bitEncoding(); |
| 133 | 133 | |
| 134 | 134 | if ( wfReadOnly() ) { |
| 135 | 135 | $data['readonly'] = ''; |
| — | — | @@ -209,9 +209,9 @@ |
| 210 | 210 | } |
| 211 | 211 | |
| 212 | 212 | protected function appendSpecialPageAliases( $property ) { |
| 213 | | - global $wgLang; |
| | 213 | + global $wgContLang; |
| 214 | 214 | $data = array(); |
| 215 | | - foreach ( $wgLang->getSpecialPageAliases() as $specialpage => $aliases ) |
| | 215 | + foreach ( $wgContLang->getSpecialPageAliases() as $specialpage => $aliases ) |
| 216 | 216 | { |
| 217 | 217 | $arr = array( 'realname' => $specialpage, 'aliases' => $aliases ); |
| 218 | 218 | $this->getResult()->setIndexedTagName( $arr['aliases'], 'alias' ); |