| Index: trunk/extensions/SiteMatrix/SiteMatrix_body.php |
| — | — | @@ -156,7 +156,7 @@ |
| 157 | 157 | * @return string |
| 158 | 158 | */ |
| 159 | 159 | public function getDBName( $minor, $major ) { |
| 160 | | - return $minor . $major; |
| | 160 | + return str_replace( '-', '_', $minor ) . $major; |
| 161 | 161 | } |
| 162 | 162 | |
| 163 | 163 | /** |
| — | — | @@ -183,11 +183,13 @@ |
| 184 | 184 | // not very reliable. |
| 185 | 185 | global $wgConf; |
| 186 | 186 | |
| 187 | | - if( $wgConf->get( 'wgReadOnly', $dbname, $major, array( 'site' => $major, 'lang' => $minor ) ) ) |
| | 187 | + if( $wgConf->get( 'wgReadOnly', $dbname, $major, array( 'site' => $major, 'lang' => $minor ) ) ) { |
| 188 | 188 | return true; |
| | 189 | + } |
| 189 | 190 | $readOnlyFile = $wgConf->get( 'wgReadOnlyFile', $dbname, $major, array( 'site' => $major, 'lang' => $minor ) ); |
| 190 | | - if( $readOnlyFile && file_exists( $readOnlyFile ) ) |
| | 191 | + if( $readOnlyFile && file_exists( $readOnlyFile ) ) { |
| 191 | 192 | return true; |
| | 193 | + } |
| 192 | 194 | return false; |
| 193 | 195 | } |
| 194 | 196 | |