| Index: branches/wmf/1.18wmf1/extensions/SiteMatrix/SiteMatrix_body.php |
| — | — | @@ -145,7 +145,7 @@ |
| 146 | 146 | * @return string |
| 147 | 147 | */ |
| 148 | 148 | public function getDBName( $minor, $major ) { |
| 149 | | - return $minor . $major; |
| | 149 | + return str_replace( '-', '_', $minor ) . $major; |
| 150 | 150 | } |
| 151 | 151 | |
| 152 | 152 | /** |
| — | — | @@ -172,11 +172,13 @@ |
| 173 | 173 | // not very reliable. |
| 174 | 174 | global $wgConf; |
| 175 | 175 | |
| 176 | | - if( $wgConf->get( 'wgReadOnly', $dbname, $major, array( 'site' => $major, 'lang' => $minor ) ) ) |
| | 176 | + if( $wgConf->get( 'wgReadOnly', $dbname, $major, array( 'site' => $major, 'lang' => $minor ) ) ) { |
| 177 | 177 | return true; |
| | 178 | + } |
| 178 | 179 | $readOnlyFile = $wgConf->get( 'wgReadOnlyFile', $dbname, $major, array( 'site' => $major, 'lang' => $minor ) ); |
| 179 | | - if( $readOnlyFile && file_exists( $readOnlyFile ) ) |
| | 180 | + if( $readOnlyFile && file_exists( $readOnlyFile ) ) { |
| 180 | 181 | return true; |
| | 182 | + } |
| 181 | 183 | return false; |
| 182 | 184 | } |
| 183 | 185 | |
| Property changes on: branches/wmf/1.18wmf1/extensions/SiteMatrix |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 184 | 186 | Merged /trunk/extensions/SiteMatrix:r110249 |