Merge remote-tracking branch 'origin/develop' into develop

pydio · Feb 25, 2016 · a8f78c8 · a8f78c8
2 parents e0c03ee + aebf135
commit a8f78c8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/core/src/plugins/core.index/class.CoreIndexer.php b/core/src/plugins/core.index/class.CoreIndexer.php
@@ -114,7 +114,7 @@ public function recursiveIndexation($node, $depth = 0)
         if($user == null && AuthService::usersEnabled()) $user = AuthService::getLoggedUser();
         if($depth == 0){
             $this->debug("Starting indexation - node.index.recursive.start  - ". memory_get_usage(true) ."  - ". $node->getUrl());
-            $this->setIndexStatus("RUNNING", str_replace("%s", $node->getPath(), $messages["core.index.8"]), $repository, $user);
+            $this->setIndexStatus("RUNNING", str_replace("%s", SystemTextEncoding::toUTF8($node->getPath()), $messages["core.index.8"]), $repository, $user);
             AJXP_Controller::applyHook("node.index.recursive.start", array($node));
         }else{
             if($this->isInterruptRequired($repository, $user)){
@@ -128,7 +128,7 @@ public function recursiveIndexation($node, $depth = 0)
         if(!ConfService::currentContextIsCommandLine()) @set_time_limit(120);
         $url = $node->getUrl();
         $this->debug("Indexing Node parent node ".$url);
-        $this->setIndexStatus("RUNNING", str_replace("%s", $node->getPath(), $messages["core.index.8"]), $repository, $user);
+        $this->setIndexStatus("RUNNING", str_replace("%s", SystemTextEncoding::toUTF8($node->getPath()), $messages["core.index.8"]), $repository, $user);
         if($node->getPath() != "/"){
             try {
                 AJXP_Controller::applyHook("node.index", array($node));