Download as
Browse Code »

Commit bb10742792dc8c0f00231bfcb5b78a102f76a365

Authored by Edmar Moretti
1 parent 20872007
Exists in master and in 7 other branches composer, doc-root, docker, guia, licenca, readme, unmaintened

--no commit message

Showing 1 changed file with 6 additions and 1 deletions   Show diff stats
ms_criamapa.php
  Diff comments   View file @bb10742
@@ -163,7 +163,8 @@ Inclui os programas php com funções utilizadas pelo ms_criamapa.php @@ -163,7 +163,8 @@ Inclui os programas php com funções utilizadas pelo ms_criamapa.php
163 163
164 include_once ($caminho."classesphp/pega_variaveis.php"); 164 include_once ($caminho."classesphp/pega_variaveis.php");
165 include_once ($caminho."classesphp/funcoes_gerais.php"); 165 include_once ($caminho."classesphp/funcoes_gerais.php");
166 - 166 +$versao = versao();
  167 +$versao = $versao["principal"];
167 if(!isset($dir_tmp)) 168 if(!isset($dir_tmp))
168 {include_once ($caminho."ms_configura.php");} 169 {include_once ($caminho."ms_configura.php");}
169 170
@@ -309,7 +310,11 @@ if(!isset($base) || $base == "") @@ -309,7 +310,11 @@ if(!isset($base) || $base == "")
309 } 310 }
310 else 311 else
311 { 312 {
  313 +<<<<<<< .mine
  314 + $base = "geral1v".versao;
  315 +=======
312 $base = "geral1v".$versao; 316 $base = "geral1v".$versao;
  317 +>>>>>>> .r2359
313 $estadosl = "estadosl"; 318 $estadosl = "estadosl";
314 } 319 }
315 } 320 }