From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Mon, 4 Aug 2014 19:55:24 +0000 (+0200)
Subject: changed the way we check for HHVM
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=3e6c9551eba3f1e05d58e982bda9147d3c06331d;p=web%2Fkonrad%2Ftwig.git

changed the way we check for HHVM
---

diff --git a/lib/Twig/Extension/Core.php b/lib/Twig/Extension/Core.php
index 3092eb8..ef36576 100644
--- a/lib/Twig/Extension/Core.php
+++ b/lib/Twig/Extension/Core.php
@@ -944,7 +944,7 @@ function twig_escape_filter(Twig_Environment $env, $string, $strategy = 'html',
             static $htmlspecialcharsCharsets;
 
             if (null === $htmlspecialcharsCharsets) {
-                if ('hiphop' === substr(PHP_VERSION, -6)) {
+                if (defined('HHVM_VERSION')) {
                     $htmlspecialcharsCharsets = array('utf-8' => true, 'UTF-8' => true);
                 } else {
                     $htmlspecialcharsCharsets = array(