jenkins-bot has submitted this change and it was merged.
Change subject: New Wikidata Build - 2015-04-10T20:00:33+0000
......................................................................
New Wikidata Build - 2015-04-10T20:00:33+0000
Change-Id: I488d620c4ec47c3a6a28c5612034a2c0d9562482
---
M Wikidata.localisation.php
M Wikidata.php
M composer.lock
M extensions/Wikibase/lib/includes/StringNormalizer.php
M extensions/Wikibase/lib/includes/store/sql/TermSqlIndex.php
M vendor/composer/installed.json
6 files changed, 55 insertions(+), 29 deletions(-)
Approvals:
JanZerebecki: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Wikidata.localisation.php b/Wikidata.localisation.php
index 4a402e2..22708a5 100644
--- a/Wikidata.localisation.php
+++ b/Wikidata.localisation.php
@@ -8,11 +8,18 @@
$wgEnableWikibaseRepo = false;
$wgEnableWikibaseClient = false;
-require_once __DIR__ . '/vendor/autoload.php';
-require_once __DIR__ . '/extensions/Wikibase/repo/Wikibase.php';
-require_once __DIR__ . '/extensions/Wikidata.org/WikidataOrg.php';
-require_once __DIR__ . '/extensions/PropertySuggester/PropertySuggester.php';
-require_once __DIR__ . '/extensions/Wikibase/client/WikibaseClient.php';
+$wgWikidataBaseDir = $IP;
+
+if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
+ $wgWikidataBaseDir = __DIR__;
+ require_once __DIR__ . '/vendor/autoload.php';
+}
+
+require_once "$wgWikidataBaseDir/extensions/Wikibase/repo/Wikibase.php";
+require_once "$wgWikidataBaseDir/extensions/Wikidata.org/WikidataOrg.php";
+require_once
"$wgWikidataBaseDir/extensions/WikimediaBadges/WikimediaBadges.php";
+require_once
"$wgWikidataBaseDir/extensions/PropertySuggester/PropertySuggester.php";
+require_once
"$wgWikidataBaseDir/extensions/Wikibase/client/WikibaseClient.php";
$wgExtensionCredits['wikibase'][] = array(
'path' => __DIR__,
diff --git a/Wikidata.php b/Wikidata.php
index 0610e8e..c662ae3 100644
--- a/Wikidata.php
+++ b/Wikidata.php
@@ -18,18 +18,38 @@
$wgEnableWikibaseRepo = false;
$wgEnableWikibaseClient = false;
-include_once __DIR__ . '/vendor/autoload.php';
+$wgWikidataBaseDir = $IP;
+
+if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
+ include_once __DIR__ . '/vendor/autoload.php';
+
+ // @fixme generating these settings with composer doesn't work with
+ // the composer-merge-plugin. We would need to fix that and probably
+ // handle this somewhat differently. For now, this way at least
+ // works with the current Wikidata build process, with composer run
+ // here and the results committed to gerrit.
+ //
+ // see T95663 for details on migrating and supporting install with
+ // composer-merge-plugin
+ if ( !empty( $wmgUseWikibaseRepo ) ) {
+ include_once __DIR__ . '/WikibaseRepo.settings.php';
+ }
+
+ if ( !empty( $wmgUseWikibaseClient ) ) {
+ include_once __DIR__ . '/WikibaseClient.settings.php';
+ }
+
+ $wgWikidataBaseDir = __DIR__;
+}
if ( !empty( $wmgUseWikibaseRepo ) ) {
- include_once __DIR__ . '/extensions/Wikibase/repo/Wikibase.php';
- include_once __DIR__ . '/extensions/Wikidata.org/WikidataOrg.php';
- include_once __DIR__ .
'/extensions/PropertySuggester/PropertySuggester.php';
- include_once __DIR__ . '/WikibaseRepo.settings.php';
+ include_once "$wgWikidataBaseDir/extensions/Wikibase/repo/Wikibase.php";
+ include_once
"$wgWikidataBaseDir/extensions/Wikidata.org/WikidataOrg.php";
+ include_once
"$wgWikidataBaseDir/extensions/PropertySuggester/PropertySuggester.php";
}
if ( !empty( $wmgUseWikibaseClient ) ) {
- include_once __DIR__ . '/extensions/Wikibase/client/WikibaseClient.php';
- include_once __DIR__ . '/WikibaseClient.settings.php';
+ include_once
"$wgWikidataBaseDir/extensions/Wikibase/client/WikibaseClient.php";
}
$wgHooks['UnitTestsList'][] = '\Wikidata\WikidataHooks::onUnitTestsList';
diff --git a/composer.lock b/composer.lock
index ebf3b1e..220b41a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1209,12 +1209,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "79b17f8347fc266df8b2830daccc2115d9e060f3"
+ "reference": "d30814491377ac9cb6cffa44da53c396d6978709"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/79b17f8347fc266df8b2830daccc2115d9e060f3";,
- "reference": "79b17f8347fc266df8b2830daccc2115d9e060f3",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/d30814491377ac9cb6cffa44da53c396d6978709";,
+ "reference": "d30814491377ac9cb6cffa44da53c396d6978709",
"shasum": ""
},
"require": {
@@ -1282,7 +1282,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2015-04-10 14:27:12"
+ "time": "2015-04-10 15:05:25"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/lib/includes/StringNormalizer.php
b/extensions/Wikibase/lib/includes/StringNormalizer.php
index 5bead8c..3439506 100644
--- a/extensions/Wikibase/lib/includes/StringNormalizer.php
+++ b/extensions/Wikibase/lib/includes/StringNormalizer.php
@@ -87,11 +87,11 @@
public function trimWhitespace( $inputString ) {
$inputString = $this->trimBadChars( $inputString );
- // \p{Z} - whitespace
- // \p{Cc} - control chars
// WARNING: *any* invalid UTF8 sequence causes preg_replace to
return an empty string.
- $trimmed = preg_replace(
'/^(\p{Z}|\p{Cc})+|(\p{Z}|\p{Cc})+$/u', '', $inputString );
- $trimmed = preg_replace( '/[\p{Cc}]+/u', ' ', $trimmed );
+ // \p{Cc} only includes general control characters.
+ $trimmed = preg_replace( '/\p{Cc}+/u', ' ', $inputString );
+ // \p{Z} includes all whitespace characters and invisible
separators.
+ $trimmed = preg_replace( '/^\p{Z}+|\p{Z}+$/u', '', $trimmed );
return $trimmed;
}
diff --git a/extensions/Wikibase/lib/includes/store/sql/TermSqlIndex.php
b/extensions/Wikibase/lib/includes/store/sql/TermSqlIndex.php
index c26f724..345742a 100644
--- a/extensions/Wikibase/lib/includes/store/sql/TermSqlIndex.php
+++ b/extensions/Wikibase/lib/includes/store/sql/TermSqlIndex.php
@@ -968,12 +968,11 @@
wfWarn( "Unicode normalization failed for `$text`" );
}
- // \p{Z} - whitespace
- // \p{C} - control chars
// WARNING: *any* invalid UTF8 sequence causes preg_replace to
return an empty string.
- $strippedText = $nfcText;
- $strippedText = preg_replace( '/[\p{Cc}\p{Cf}\p{Cn}\p{Cs}]+/u',
' ', $strippedText );
- $strippedText = preg_replace( '/^[\p{Z}]+|[\p{Z}]+$/u', '',
$strippedText );
+ // Control character classes excluding private use areas.
+ $strippedText = preg_replace( '/[\p{Cc}\p{Cf}\p{Cn}\p{Cs}]+/u',
' ', $nfcText );
+ // \p{Z} includes all whitespace characters and invisible
separators.
+ $strippedText = preg_replace( '/^\p{Z}+|\p{Z}+$/u', '',
$strippedText );
if ( $strippedText === '' ) {
// NOTE: This happens when there is only whitespace in
the string.
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 34e7b52..8290cca 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1199,12 +1199,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "79b17f8347fc266df8b2830daccc2115d9e060f3"
+ "reference": "d30814491377ac9cb6cffa44da53c396d6978709"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/79b17f8347fc266df8b2830daccc2115d9e060f3";,
- "reference": "79b17f8347fc266df8b2830daccc2115d9e060f3",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/d30814491377ac9cb6cffa44da53c396d6978709";,
+ "reference": "d30814491377ac9cb6cffa44da53c396d6978709",
"shasum": ""
},
"require": {
@@ -1231,7 +1231,7 @@
"conflict": {
"mediawiki/mediawiki": "<1.23"
},
- "time": "2015-04-10 14:27:12",
+ "time": "2015-04-10 15:05:25",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/203456
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I488d620c4ec47c3a6a28c5612034a2c0d9562482
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: master
Gerrit-Owner: WikidataBuilder <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: JanZerebecki <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
