Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/247939
Change subject: TemplateParser: Use context makeKey() instead of wfMemcKey()
......................................................................
TemplateParser: Use context makeKey() instead of wfMemcKey()
Also:
* Use ternary shorthand.
* Remove verbose comment about APC fallback. APC always requires
a fallback and is enforced by the method being called. Stating
the obvious is confusing here.
Change-Id: Ie5cb3bdc60600806b01b57f1f1b352b981818b0d
---
M includes/TemplateParser.php
1 file changed, 3 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/39/247939/1
diff --git a/includes/TemplateParser.php b/includes/TemplateParser.php
index 3c62c14..44d264d 100644
--- a/includes/TemplateParser.php
+++ b/includes/TemplateParser.php
@@ -41,7 +41,7 @@
* @param boolean $forceRecompile
*/
public function __construct( $templateDir = null, $forceRecompile =
false ) {
- $this->templateDir = $templateDir ? $templateDir : __DIR__ .
'/templates';
+ $this->templateDir = $templateDir ?: __DIR__ . '/templates';
$this->forceRecompile = $forceRecompile;
}
@@ -49,7 +49,7 @@
* Constructs the location of the the source Mustache template
* @param string $templateName The name of the template
* @return string
- * @throws UnexpectedValueException Disallows upwards directory
traversal via $templateName
+ * @throws UnexpectedValueException If $templateName attempts upwards
directory traversal
*/
protected function getTemplateFilename( $templateName ) {
// Prevent upwards directory traversal using same methods as
Title::secureAndSplit
@@ -103,10 +103,8 @@
if ( $secretKey ) {
// See if the compiled PHP code is stored in cache.
- // CACHE_ACCEL throws an exception if no suitable
object cache is present, so fall
- // back to CACHE_ANYTHING.
$cache = ObjectCache::newAccelerator( CACHE_ANYTHING );
- $key = wfMemcKey( 'template', $templateName, $fastHash
);
+ $key = $cache->makeKey( 'template', $templateName,
$fastHash );
$code = $this->forceRecompile ? null : $cache->get(
$key );
if ( !$code ) {
--
To view, visit https://gerrit.wikimedia.org/r/247939
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie5cb3bdc60600806b01b57f1f1b352b981818b0d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
