Merge branch 'develop'

Prepping for 2.2.0RC1.
zendframework · May 1, 2013 · 60a7155 · 60a7155
commit 60a7155
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Escaper.php b/src/Escaper.php
@@ -49,7 +49,7 @@ class Escaper
      *
      * @var string
      */
-    protected $htmlSpecialCharsFlags = \ENT_QUOTES;
+    protected $htmlSpecialCharsFlags = ENT_QUOTES;
 
     /**
      * Static Matcher which escapes characters for HTML Attribute contexts
@@ -119,7 +119,7 @@ public function __construct($encoding = null)
         }
 
         if (defined('ENT_SUBSTITUTE')) {
-            $this->htmlSpecialCharsFlags|= \ENT_SUBSTITUTE;
+            $this->htmlSpecialCharsFlags|= ENT_SUBSTITUTE;
         }
 
         // set matcher callbacks