| Index: trunk/extensions/Offline/DatabaseBz2.php |
| — | — | @@ -28,8 +28,6 @@ |
| 29 | 29 | { |
| 30 | 30 | function select( $table, $fields, $conds='', $fname = 'Database::select', $options = array() ) |
| 31 | 31 | { |
| 32 | | - require_once(dirname(__FILE__).'/DumpReader.php'); |
| 33 | | - require_once(dirname(__FILE__).'/CachedStorage.php'); |
| 34 | 32 | $row = array(); |
| 35 | 33 | $title = false; |
| 36 | 34 | if (isset($conds['page_title'])) { |
| Index: trunk/extensions/Offline/Offline.php |
| — | — | @@ -19,9 +19,12 @@ |
| 20 | 20 | $wgSpecialPageGroups['Offline'] = 'wiki'; // XXX is not the key? |
| 21 | 21 | |
| 22 | 22 | |
| | 23 | +$wgAutoloadClasses['CachedStorage'] = $dir.'/CachedStorage.php'; |
| 23 | 24 | $wgAutoloadClasses['DatabaseBz2'] = $dir.'/DatabaseBz2.php'; |
| | 25 | +$wgAutoloadClasses['DumpReader'] = $dir.'/DumpReader.php'; |
| 24 | 26 | $wgAutoloadClasses['SearchBz2'] = $dir.'/SearchBz2.php'; |
| 25 | 27 | $wgAutoloadClasses['SpecialOffline'] = $dir.'/SpecialOffline.php'; |
| | 28 | +$wgAutoloadClasses['XapianDatabase'] = $dir.'/xapian.php'; |
| 26 | 29 | |
| 27 | 30 | |
| 28 | 31 | function wfOfflineInit() { |
| Index: trunk/extensions/Offline/SearchBz2.php |
| — | — | @@ -48,7 +48,6 @@ |
| 49 | 49 | protected function searchInternal( $term, $fulltext ) { |
| 50 | 50 | global $wgCountTotalSearchHits; |
| 51 | 51 | |
| 52 | | - require_once(dirname(__FILE__).'/DumpReader.php'); |
| 53 | 52 | $results = DumpReader::index_search($term); |
| 54 | 53 | |
| 55 | 54 | return new Bz2SearchResultSet( $results, $term); |
| Index: trunk/extensions/Offline/SpecialOffline.php |
| — | — | @@ -28,8 +28,6 @@ |
| 29 | 29 | function execute($param) { |
| 30 | 30 | global $wgOut, $wgTitle; |
| 31 | 31 | |
| 32 | | - require_once(dirname(__FILE__).'/DumpReader.php'); |
| 33 | | - |
| 34 | 32 | $this->setHeaders(); |
| 35 | 33 | $this->outputHeader(); |
| 36 | 34 | |
| Index: trunk/extensions/Offline/DumpReader.php |
| — | — | @@ -77,7 +77,6 @@ |
| 78 | 78 | #wfDebug("looking up word [$title]"); |
| 79 | 79 | |
| 80 | 80 | try { |
| 81 | | - require_once("xapian.php"); |
| 82 | 81 | global $wgOfflineWikiPath; |
| 83 | 82 | $db = new XapianDatabase("$wgOfflineWikiPath/db"); |
| 84 | 83 | #$qp = new XapianQueryParser(); |