jenkins-bot has submitted this change and it was merged.
Change subject: Fixes for the recent changes
......................................................................
Fixes for the recent changes
Change-Id: I6b9313ab76cdd5eaf2578aa156823e054aa17f45
---
M SemanticForms.php
M includes/SF_Utils.php
2 files changed, 4 insertions(+), 2 deletions(-)
Approvals:
Yaron Koren: Checked; Looks good to me, approved
jenkins-bot: Verified
diff --git a/SemanticForms.php b/SemanticForms.php
index 0f48316..cbe437c 100644
--- a/SemanticForms.php
+++ b/SemanticForms.php
@@ -229,7 +229,7 @@
$GLOBALS['wgAutoloadClasses']['SFTokensInput'] = __DIR__ .
'/includes/forminputs/SF_TokensInput.php';
$GLOBALS['wgAutoloadClasses']['SFGoogleMapsInput'] = __DIR__ .
'/includes/forminputs/SF_GoogleMapsInput.php';
$GLOBALS['wgAutoloadClasses']['SFOpenLayersInput'] = __DIR__ .
'/includes/forminputs/SF_OpenLayersInput.php';
-$GLOBALS['wgAutoloadClasses']['SFRegExpInput'] = $dir .
'/includes/SF_RegExpInput.php';
+$GLOBALS['wgAutoloadClasses']['SFRegExpInput'] = __DIR__ .
'/includes/forminputs/SF_RegExpInput.php';
$GLOBALS['wgAutoloadClasses']['SFWikiPage'] = __DIR__ .
'/includes/wikipage/SF_WikiPage.php';
$GLOBALS['wgAutoloadClasses']['SFWikiPageTemplate'] = __DIR__ .
'/includes/wikipage/SF_WikiPageTemplate.php';
diff --git a/includes/SF_Utils.php b/includes/SF_Utils.php
index 3589755..0b216bb 100644
--- a/includes/SF_Utils.php
+++ b/includes/SF_Utils.php
@@ -77,7 +77,9 @@
}
public static function initialize() {
- $GLOBALS['sfgScriptPath'] = __DIR__ . '/../';
+ $GLOBALS['sfgPartialPath'] = '/extensions/SemanticForms';
+ $GLOBALS['sfgScriptPath'] = $GLOBALS['wgScriptPath'] . $GLOBALS[
+'sfgPartialPath'];
// 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
--
To view, visit https://gerrit.wikimedia.org/r/269154
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6b9313ab76cdd5eaf2578aa156823e054aa17f45
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren <yaro...@gmail.com>
Gerrit-Reviewer: Yaron Koren <yaro...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
