Download as
Browse Code »

Commit e97569c85e631836d732c726273fa56ccadb3222

Authored by Guilherme Andrade Del Cantoni
2 parents 0d2ff516 3d98c9e6
Exists in master and in 21 other branches Marcelotmpdesenv, Marctmp, desenv, feature-050, feature-076, feature-50, feature-envio-e-recebimento-de-detalhes-de-contato, feature-envio-processo-anexado, feature-modal, fix-101, fix-43, fix-58, fix-86, fix-89, fix-92, fix-93, fix-95, fix-96, fix-97, fix-99, fix-gearman

Resolução de conflito de merge

Showing 1 changed file with 1 additions and 2 deletions   Show diff stats
rn/ProcessoEletronicoRN.php
  Diff comments   View file @e97569c
@@ -274,8 +274,7 @@ class ProcessoEletronicoRN extends InfraRN { @@ -274,8 +274,7 @@ class ProcessoEletronicoRN extends InfraRN {
274 $objEstrutura->hierarquia->nivel = array($objEstrutura->hierarquia->nivel); 274 $objEstrutura->hierarquia->nivel = array($objEstrutura->hierarquia->nivel);
275 } 275 }
276 276
277 - $objEstrutura->hierarquia->nivel = (array) $objEstrutura->hierarquia->nivel;  
278 - foreach ($objEstrutura->hierarquia->nivel as &$objNivel) { 277 + foreach ($objEstrutura->hierarquia->nivel as &$objNivel) {
279 $objNivel->nome = utf8_decode($objNivel->nome); 278 $objNivel->nome = utf8_decode($objNivel->nome);
280 } 279 }
281 } 280 }