Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/279701
Change subject: Fixes for ec27acd
......................................................................
Fixes for ec27acd
Bug: T130989
Change-Id: I94f7f9d6d00153b5c3fb220acdfa80e192007573
(cherry picked from commit c418980451cd418e801adf28bcbd6464b82792a0)
---
M includes/SF_AutocompleteAPI.php
M includes/SF_Hooks.php
M includes/SF_TemplateField.php
M includes/SF_ValuesUtils.php
4 files changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticForms
refs/changes/01/279701/1
diff --git a/includes/SF_AutocompleteAPI.php b/includes/SF_AutocompleteAPI.php
index 78e6c2b..3c40b0a 100644
--- a/includes/SF_AutocompleteAPI.php
+++ b/includes/SF_AutocompleteAPI.php
@@ -46,15 +46,15 @@
} elseif ( !is_null( $property ) ) {
$data = self::getAllValuesForProperty( $property,
$substr );
} elseif ( !is_null( $category ) ) {
- $data = SFUtils::getAllPagesForCategory( $category, 3,
$substr );
+ $data = SFValuesUtils::getAllPagesForCategory(
$category, 3, $substr );
} elseif ( !is_null( $concept ) ) {
- $data = SFUtils::getAllPagesForConcept( $concept,
$substr );
+ $data = SFValuesUtils::getAllPagesForConcept( $concept,
$substr );
} elseif ( !is_null( $cargo_table ) && !is_null( $cargo_field )
) {
$data = self::getAllValuesForCargoField( $cargo_table,
$cargo_field, $field_is_array, $substr, $base_cargo_table, $base_cargo_field,
$basevalue );
} elseif ( !is_null( $namespace ) ) {
- $data = SFUtils::getAllPagesForNamespace( $namespace,
$substr );
+ $data = SFValuesUtils::getAllPagesForNamespace(
$namespace, $substr );
} elseif ( !is_null( $external_url ) ) {
- $data = SFUtils::getValuesFromExternalURL(
$external_url, $substr );
+ $data = SFValuesUtils::getValuesFromExternalURL(
$external_url, $substr );
} else {
$data = array();
}
@@ -236,7 +236,7 @@
if ( !is_null( $substring ) ) {
// "Page" type property valeus are stored differently
// in the DB, i.e. underlines instead of spaces.
- $conditions[] =
SFUtils::getSQLConditionForAutocompleteInColumn( $valueField, $substring,
$propertyHasTypePage );
+ $conditions[] =
SFValuesUtils::getSQLConditionForAutocompleteInColumn( $valueField, $substring,
$propertyHasTypePage );
}
$sqlOptions['ORDER BY'] = $valueField;
diff --git a/includes/SF_Hooks.php b/includes/SF_Hooks.php
index 2d2a1f3..92d8e92 100644
--- a/includes/SF_Hooks.php
+++ b/includes/SF_Hooks.php
@@ -84,7 +84,7 @@
// Admin Links hook needs to be called in a delayed way so that
it
// will always be called after SMW's Admin Links addition; as of
// SMW 1.9, SMW delays calling all its hook functions.
- $GLOBALS['wgHooks']['AdminLinks'][] =
'SFUtils::addToAdminLinks';
+ $GLOBALS['wgHooks']['AdminLinks'][] =
'SFHooks::addToAdminLinks';
// This global variable is needed so that other
// extensions can hook into it to add their own
diff --git a/includes/SF_TemplateField.php b/includes/SF_TemplateField.php
index de9dc52..b61526e 100644
--- a/includes/SF_TemplateField.php
+++ b/includes/SF_TemplateField.php
@@ -63,8 +63,8 @@
$store = SFUtils::getSMWStore();
// this returns an array of objects
- $allowed_values = SFUtils::getSMWPropertyValues( $store,
$proptitle, "Allows value" );
- $label_formats = SFUtils::getSMWPropertyValues( $store,
$proptitle, "Has field label format" );
+ $allowed_values = SFValuesUtils::getSMWPropertyValues( $store,
$proptitle, "Allows value" );
+ $label_formats = SFValuesUtils::getSMWPropertyValues( $store,
$proptitle, "Has field label format" );
$propValue = SMWDIProperty::newFromUserLabel(
$this->mSemanticProperty );
$this->mPropertyType = $propValue->findPropertyTypeID();
diff --git a/includes/SF_ValuesUtils.php b/includes/SF_ValuesUtils.php
index 062299f..ee639f3 100644
--- a/includes/SF_ValuesUtils.php
+++ b/includes/SF_ValuesUtils.php
@@ -308,7 +308,7 @@
$conditions = array();
$conditions['page_namespace'] = $matchingNamespaceCode;
if ( $substring != null ) {
- $conditions[] =
SFUtils::getSQLConditionForAutocompleteInColumn( 'page_title', $substring );
+ $conditions[] =
self::getSQLConditionForAutocompleteInColumn( 'page_title', $substring );
}
$res = $db->select( 'page',
'page_title',
--
To view, visit https://gerrit.wikimedia.org/r/279701
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I94f7f9d6d00153b5c3fb220acdfa80e192007573
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: wmf/1.27.0-wmf.18
Gerrit-Owner: Alex Monk <[email protected]>
Gerrit-Reviewer: Yaron Koren <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
