| Index: trunk/extensions/Wikidata/OmegaWiki/OmegaWikiAttributes.php |
| — | — | @@ -367,7 +367,6 @@ |
| 368 | 368 | $instance[$viewInformation->hashCode()] = $instance["last"]; |
| 369 | 369 | } |
| 370 | 370 | } |
| 371 | | - |
| 372 | 371 | return $instance["last"]; |
| 373 | 372 | } |
| 374 | 373 | |
| Index: trunk/extensions/Wikidata/OmegaWiki/Wikidata.php |
| — | — | @@ -14,7 +14,6 @@ |
| 15 | 15 | // The following member variables control some application specific preferences |
| 16 | 16 | protected $filterLanguageId = 0; // Filter pages on this languageId, set to 0 to show all languages |
| 17 | 17 | protected $possiblySynonymousRelationTypeId = 0; // Put this relation type in a special section "Possibly synonymous" |
| 18 | | - protected $showLanguageSelector = true; // Show language selector at the top of each wiki data page |
| 19 | 18 | protected $showClassicPageTitles = true; // Show classic page titles instead of prettier page titles |
| 20 | 19 | |
| 21 | 20 | protected $propertyToColumnFilters = array(); |
| — | — | @@ -25,16 +24,13 @@ |
| 26 | 25 | |
| 27 | 26 | public function __construct() { |
| 28 | 27 | global |
| 29 | | - $wgFilterLanguageId, $wgShowLanguageSelector, |
| | 28 | + $wgFilterLanguageId, |
| 30 | 29 | $wgShowClassicPageTitles, $wgPossiblySynonymousRelationTypeId, |
| 31 | 30 | $wgPropertyToColumnFilters; |
| 32 | 31 | |
| 33 | 32 | if (isset($wgFilterLanguageId)) |
| 34 | 33 | $this->filterLanguageId = $wgFilterLanguageId; |
| 35 | 34 | |
| 36 | | - if (isset($wgShowLanguageSelector)) |
| 37 | | - $this->showLanguageSelector = $wgShowLanguageSelector; |
| 38 | | - |
| 39 | 35 | if (isset($wgShowClassicPageTitles)) |
| 40 | 36 | $this->showClassicPageTitles = $wgShowClassicPageTitles; |
| 41 | 37 | |
| — | — | @@ -45,23 +41,11 @@ |
| 46 | 42 | $this->propertyToColumnFilters = $wgPropertyToColumnFilters; |
| 47 | 43 | } |
| 48 | 44 | |
| 49 | | - function getLanguageSelector() { |
| 50 | | - global |
| 51 | | - $wgUser; |
| 52 | | - |
| 53 | | - $userlang=$wgUser->getOption('language'); |
| 54 | | - $skin = $wgUser->getSkin(); |
| 55 | | - |
| 56 | | - return wfMsg('ow_uilang',"<b>$userlang</b>"). " — " . $skin->makeLink("Special:Preferences", wfMsg('ow_uilang_set')); |
| 57 | | - } |
| 58 | 45 | |
| 59 | 46 | protected function outputViewHeader() { |
| 60 | 47 | global |
| 61 | 48 | $wgOut; |
| 62 | 49 | |
| 63 | | - if ($this->showLanguageSelector) |
| 64 | | - $wgOut->addHTML($this->getLanguageSelector()); |
| 65 | | - |
| 66 | 50 | if($this->showDataSetPanel) |
| 67 | 51 | $wgOut->addHTML($this->getDataSetPanel()); |
| 68 | 52 | } |
| — | — | @@ -177,9 +161,6 @@ |
| 178 | 162 | if ($wgRequest->getText('save') != '') |
| 179 | 163 | $this->saveWithinTransaction(); |
| 180 | 164 | |
| 181 | | - if ($this->showLanguageSelector) |
| 182 | | - $wgOut->addHTML($this->getLanguageSelector()); |
| 183 | | - |
| 184 | 165 | $viewInformation = new ViewInformation(); |
| 185 | 166 | $viewInformation->filterLanguageId = $this->filterLanguageId; |
| 186 | 167 | $viewInformation->possiblySynonymousRelationTypeId = $this->possiblySynonymousRelationTypeId; |
| — | — | @@ -227,9 +208,6 @@ |
| 228 | 209 | |
| 229 | 210 | $transactionId = $wgRequest->getInt('transaction'); |
| 230 | 211 | |
| 231 | | - if ($this->showLanguageSelector) |
| 232 | | - $wgOut->addHTML($this->getLanguageSelector()); |
| 233 | | - |
| 234 | 212 | $wgOut->addHTML(getOptionPanel( |
| 235 | 213 | array( |
| 236 | 214 | 'Transaction' => getSuggest('transaction','transaction', array(), $transactionId, getTransactionLabel($transactionId), array(0, 2, 3)), |