jenkins-bot has submitted this change and it was merged.
Change subject: Revert "Remove obsolete hiphop code"
......................................................................
Revert "Remove obsolete hiphop code"
This reverts commit 045c0a9553 / change I35a7ca501820. Under HHVM,
loading the PHP file is indeed more efficient than loading serialized
data and unserializing it.
Bug: T127780
Change-Id: I256c66d35d43296af8d64f831f44d9c6fdf0e041
---
M wikihiero.body.php
1 file changed, 15 insertions(+), 9 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wikihiero.body.php b/wikihiero.body.php
index cc83062..1348dfa 100644
--- a/wikihiero.body.php
+++ b/wikihiero.body.php
@@ -51,16 +51,22 @@
if ( self::$phonemes ) {
return;
}
-
- $fileName = dirname( __FILE__ ) . '/data/tables.ser';
- $stream = file_get_contents( $fileName );
- if ( !$stream ) {
- throw new MWException( "Cannot open serialized
hieroglyph data file $fileName!" );
+ if ( wfIsHHVM() ) {
+ require_once __DIR__ . '/data/tables.php';
+ self::$phonemes = $wh_phonemes;
+ self::$prefabs = $wh_prefabs;
+ self::$files = $wh_files;
+ } else {
+ $fileName = __DIR__ . '/data/tables.ser';
+ $stream = file_get_contents( $fileName );
+ if ( !$stream ) {
+ throw new MWException( "Cannot open serialized
hieroglyph data file $fileName!" );
+ }
+ $data = unserialize( $stream );
+ self::$phonemes = $data['wh_phonemes'];
+ self::$prefabs = $data['wh_prefabs'];
+ self::$files = $data['wh_files'];
}
- $data = unserialize( $stream );
- self::$phonemes = $data['wh_phonemes'];
- self::$prefabs = $data['wh_prefabs'];
- self::$files = $data['wh_files'];
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/322295
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I256c66d35d43296af8d64f831f44d9c6fdf0e041
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/wikihiero
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: MaxSem <maxsem.w...@gmail.com>
Gerrit-Reviewer: Mkoch <marius.k...@faktorzehn.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
