Skip to content

Commit

Permalink
Merge branch 'release/v2.0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
enfoqueNativo committed Oct 6, 2017
2 parents 6804c2c + e5caef0 commit 6b015ee
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# CHANGELOG
## v 2.0.2 06/10/2017
* Fix encoding mensaje error en respuesta

## v 2.0.1 16/05/2017
* Vuelve version para PHP 5.6 a 7+
Expand Down
3 changes: 1 addition & 2 deletions src/SIUToba/rest/http/vista_json.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ protected function get_content_type()
public function get_cuerpo()
{
$data = $this->respuesta->get_data();
if (!empty($data) && $this->respuesta->get_encoding_datos() !== 'utf-8') {
if (!empty($data)) {
$data = $this->utf8_encode_fields($data);
}

Expand Down Expand Up @@ -102,7 +102,6 @@ protected function utf8_encode_fields(array $elements)
$elements[$key] = utf8_encode($elements[$key]);
}
}

return $elements;
}
}
1 change: 1 addition & 0 deletions src/SIUToba/rest/rest.php
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,7 @@ public function procesar()
$ex->configurar_respuesta($this->response);
$this->logger->info("Excepcion de Autenticacion. Autenticar y reintentar");
$this->logger->info(var_export($this->response, true));
$this->logger->info($ex->getMessage());
} catch (rest_error_autorizacion $ex) {
$ex->configurar_respuesta($this->response);
$this->logger->info("Error de Autorizacion.");
Expand Down

0 comments on commit 6b015ee

Please sign in to comment.