diff --git a/admin/admin.db b/admin/admin.db
index 0fe14ca..93d6163 100755
Binary files a/admin/admin.db and b/admin/admin.db differ
diff --git a/classesphp/funcoes_gerais.php b/classesphp/funcoes_gerais.php
index 1fc0332..286d3b3 100755
--- a/classesphp/funcoes_gerais.php
+++ b/classesphp/funcoes_gerais.php
@@ -2725,7 +2725,13 @@ function validaAcessoTemas($map_file,$salva = true){
 	$existeIndevidos = false;
 	if(count($indevidos) > 0){
 		$existeIndevidos = true;
-		$m = ms_newMapObj($map_file);
+		if(!is_object($map_file)){
+			$m = ms_newMapObj($map_file);
+		}
+		else {
+			$m = $map_file;
+			$salva = false;
+		}
 		foreach($indevidos as $i){
 			$l = $m->getlayerbyname($i);
 			$l->set("status",MS_DELETE);
@@ -2769,24 +2775,14 @@ function listaLayersIndevidos($map_file){
 	error_reporting(0);
 	$indevidos = array();
 	$restritos = listaTemasRestritos();
-	/*
-		array(1) {
-			["_wlocalirestrito"]=>
-			array(1) {
-			[0]=>
-			string(1) "1"
-			}
-		}
-	*/
 	if(count($restritos) > 0){
 		$gruposusr = listaGruposUsrLogin();
-		/*
-		array(1) {
-			[0]=>
-			string(1) "1"
+		if(!is_object($map_file)){
+			$m = ms_newMapObj($map_file);
+		}
+		else {
+			$m = $map_file;
 		}
-		*/
-		$m = ms_newMapObj($map_file);
 		$c = $m->numlayers;
 		for ($i=0;$i < $c;++$i)	{
 			$layer = $m->getlayer($i);
diff --git a/ogc.php b/ogc.php
index fffc830..9c4795a 100755
--- a/ogc.php
+++ b/ogc.php
@@ -785,12 +785,11 @@ else{
 	//
 	processaOutputformatMapfile();
 	$nomeMapfileTmp = str_replace(".map","",$nomeMapfileTmp).".map";
+	restauraConObj($oMap,$postgis_mapa);
 	$oMap->save($nomeMapfileTmp);
-	validaAcessoTemas($nomeMapfileTmp,true);
 
-	substituiCon($nomeMapfileTmp,$postgis_mapa);
-	$oMap = ms_newMapobj($nomeMapfileTmp);
-	restauraCon($nomeMapfileTmp,$postgis_mapa);
+	validaAcessoTemas($oMap,true);
+	substituiConObj($oMap,$postgis_mapa);
 }
 
 if(ob_get_contents ()){
--
libgit2 0.21.2