| Index: trunk/extensions/Wikidata/OmegaWiki/DefinedMeaning.php |
| — | — | @@ -263,7 +263,7 @@ |
| 264 | 264 | foreach($datasets as $datasetid=>$dataset) { |
| 265 | 265 | $name=$dataset->fetchName(); |
| 266 | 266 | $dc2=$datasetid; |
| 267 | | - $html.="<a href='extensions/Wikidata/util/copy.php?dmid=$dmid&dc1=$dc1&dc2=$dc2'>$name</a><br>\n"; |
| | 267 | + $html.="<a href='../extensions/Wikidata/util/copy.php?dmid=$dmid&dc1=$dc1&dc2=$dc2'>$name</a><br>\n"; |
| 268 | 268 | } |
| 269 | 269 | |
| 270 | 270 | return $html; |
| Index: trunk/extensions/Wikidata/OmegaWiki/SpecialAddCollection.php |
| — | — | @@ -34,7 +34,7 @@ |
| 35 | 35 | require_once('WikiDataAPI.php'); |
| 36 | 36 | require_once('Transaction.php'); |
| 37 | 37 | |
| 38 | | - $dc = $wgRequest->getText('Dataset'); |
| | 38 | + $dc = $wgRequest->getText('dataset'); |
| 39 | 39 | $collectionName = $wgRequest->getText('collection'); |
| 40 | 40 | startNewTransaction($wgUser->getID(), wfGetIP(), 'Add collection ' . $collectionName); |
| 41 | 41 | bootstrapCollection($collectionName,$wgRequest->getText('language'),$wgRequest->getText('type'), $dc); |
| — | — | @@ -51,7 +51,7 @@ |
| 52 | 52 | 'Collection name' => getTextBox('collection'), |
| 53 | 53 | 'Language of name' => getSuggest('language','language'), |
| 54 | 54 | 'Collection type' => getSelect('type',array('' => 'None','RELT' => 'RELT','LEVL' => 'LEVL','CLAS' => 'CLAS', 'MAPP' => 'MAPP')), |
| 55 | | - 'Dataset' => getSelect('Dataset',$datasetarray) |
| | 55 | + 'Dataset' => getSelect('dataset',$datasetarray) |
| 56 | 56 | ), |
| 57 | 57 | '',array('create' => 'Create') |
| 58 | 58 | )); |
| Index: trunk/extensions/Wikidata/OmegaWiki/OmegaWikiEditors.php |
| — | — | @@ -662,7 +662,6 @@ |
| 663 | 663 | function getOptionAttributeOptionsEditor() { |
| 664 | 664 | |
| 665 | 665 | $o=OmegaWikiAttributes::getInstance(); |
| 666 | | - $o=OmegaWikiAttributes::getInstance(); |
| 667 | 666 | |
| 668 | 667 | $editor = new RecordSetTableEditor($o->optionAttributeOptions, new SimplePermissionController(true), new ShowEditFieldChecker(true), new AllowAddController(true), true, false, new OptionAttributeOptionsController()); |
| 669 | 668 | $editor->addEditor(new DefinedMeaningReferenceEditor($o->optionAttributeOption, new SimplePermissionController(false), true)); |
| — | — | @@ -691,8 +690,6 @@ |
| 692 | 691 | |
| 693 | 692 | $o=OmegaWikiAttributes::getInstance(); |
| 694 | 693 | |
| 695 | | - $o=OmegaWikiAttributes::getInstance(); |
| 696 | | - |
| 697 | 694 | $expressionMeaningsRecordEditor = new RecordUnorderedListEditor($o->expressionMeanings, 3); |
| 698 | 695 | |
| 699 | 696 | $exactMeaningsEditor = getExpressionMeaningsEditor($o->expressionExactMeanings, true, $viewInformation); |
| Index: trunk/extensions/Wikidata/OmegaWiki/OmegaWikiRecordSets.php |
| — | — | @@ -399,7 +399,7 @@ |
| 400 | 400 | $languageRestriction = $viewInformation->filterLanguageId != 0 ? " AND language_id=". $viewInformation->filterLanguageId : ""; |
| 401 | 401 | |
| 402 | 402 | $dbr =& wfGetDB(DB_SLAVE); |
| 403 | | - $queryResult = $dbr->query( |
| | 403 | + $sql= |
| 404 | 404 | "SELECT expression_id, language_id " . |
| 405 | 405 | " FROM {$dc}_expression_ns" . |
| 406 | 406 | " WHERE spelling=BINARY " . $dbr->addQuotes($spelling) . |
| — | — | @@ -410,8 +410,8 @@ |
| 411 | 411 | " FROM {$dc}_syntrans " . |
| 412 | 412 | " WHERE {$dc}_syntrans.expression_id={$dc}_expression_ns.expression_id" . |
| 413 | 413 | " AND ". getLatestTransactionRestriction("{$dc}_syntrans") |
| 414 | | - .")" |
| 415 | | - ); |
| | 414 | + .")"; |
| | 415 | + $queryResult = $dbr->query($sql); |
| 416 | 416 | |
| 417 | 417 | $result = new ArrayRecordSet($o->expressionsStructure, new Structure("expression-id", $o->expressionId)); |
| 418 | 418 | $languageStructure = new Structure("language", $o->language); |