Move Zend_Validate_EmailAddress to DI

1 files changed, 2 insertions, 7 deletions

diff --git a/core/Piwik.php b/core/Piwik.php
index bcc0eb8c38..32af7b9499 100644
--- a/core/Piwik.php
+++ b/core/Piwik.php
@@ -563,13 +563,8 @@ class Piwik
      */
     public static function isValidEmailString($emailAddress)
     {
-        static $zendEmailValidator;
-        if(!$zendEmailValidator) {
-            $zendEmailValidator = new \Zend_Validate_EmailAddress(array(
-                'mx' => false,
-                'deep' => false
-            ));
-        }
+        /** @var \Zend_Validate_EmailAddress $zendEmailValidator */
+        $zendEmailValidator = StaticContainer::get('Zend_Validate_EmailAddress');
         return $zendEmailValidator->isValid($emailAddress);
     }