Commit 5d0dbcfdce7d46c4a50f86782b831c361de72583
1 parent
f6837d3e
Exists in
master
Corrigido problema ao selecionar curso no cadastro de escola;
portabilis/ieducar#167
Showing
1 changed file
with
5 additions
and
1 deletions
Show diff stats
ieducar/intranet/educar_curso_xml2.php
| @@ -32,7 +32,11 @@ | @@ -32,7 +32,11 @@ | ||
| 32 | require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; | 32 | require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; |
| 33 | Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); | 33 | Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); |
| 34 | 34 | ||
| 35 | +<<<<<<< HEAD | ||
| 35 | echo "<?xml version=\"1.0\" encoding=\"ISO-8859-15\"?>\n<query xmlns=\"sugestoes\">\n"; | 36 | echo "<?xml version=\"1.0\" encoding=\"ISO-8859-15\"?>\n<query xmlns=\"sugestoes\">\n"; |
| 37 | +======= | ||
| 38 | + echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<query xmlns=\"sugestoes\">\n"; | ||
| 39 | +>>>>>>> 89ed328... Corrigido problema ao selecionar curso no cadastro de escola; | ||
| 36 | 40 | ||
| 37 | if( is_numeric( $_GET["ins"] ) ) | 41 | if( is_numeric( $_GET["ins"] ) ) |
| 38 | { | 42 | { |
| @@ -82,4 +86,4 @@ | @@ -82,4 +86,4 @@ | ||
| 82 | } | 86 | } |
| 83 | } | 87 | } |
| 84 | echo "</query>"; | 88 | echo "</query>"; |
| 85 | -?> | ||
| 86 | \ No newline at end of file | 89 | \ No newline at end of file |
| 90 | +?> |