Merge pull request #180 in ZP/z-push from...

Merge pull request #180 in ZP/z-push from bugfix/ZP-861-user-with-umlauts-in-user-name-is to develop

* commit 'b29d19cf':
  ZP-861 Move comment.
  ZP-861 User with umlauts in user name is not able to login.

(cherry picked from commit 9995418d)

src/backend/zarafa/mapiutils.php

@@ -418,8 +418,6 @@ class MAPIUtils {
         if (isset($supportmask[PR_STORE_SUPPORT_MASK]) && ($supportmask[PR_STORE_SUPPORT_MASK] & STORE_UNICODE_OK)) {
             ZLog::Write(LOGLEVEL_DEBUG, "Store supports properties containing Unicode characters.");
             define('STORE_SUPPORTS_UNICODE', true);
-            //setlocale to UTF-8 in order to support properties containing Unicode characters
-            setlocale(LC_CTYPE, "en_US.UTF-8");
             define('STORE_INTERNET_CPID', INTERNET_CPID_UTF8);
         }
     }
@@ -623,4 +621,4 @@ class MAPIUtils {
     }
 }
 
-?>
+?>
\ No newline at end of file

src/backend/zarafa/zarafa.php

@@ -75,6 +75,8 @@ include_once('backend/zarafa/mapistreamwrapper.php');
 include_once('backend/zarafa/importer.php');
 include_once('backend/zarafa/exporter.php');
 
+//setlocale to UTF-8 in order to support properties containing Unicode characters
+setlocale(LC_CTYPE, "en_US.UTF-8");
 
 class BackendZarafa implements IBackend, ISearchProvider {
     private $mainUser;