Merge pull request #1125 from dreamsxin/bug_1103

Fix BUG #1103
phalcon · Aug 20, 2013 · a6d0fe0 · a6d0fe0
2 parents 4427167 + fc4d4d6
commit a6d0fe0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/ext/debug.c b/ext/debug.c
@@ -964,7 +964,7 @@ PHP_METHOD(Phalcon_Debug, onUncaughtException){
 	zval *class_name, *css_sources, *escaped_message = NULL;
 	zval *html, *version, *file, *line, *show_back_trace;
 	zval *data_vars, *trace, *trace_item = NULL, *n = NULL, *html_item = NULL;
-	zval *_REQUEST, *value = NULL, *key_request = NULL, *_SERVER;
+	zval *_REQUEST, *value = NULL, *key_request = NULL, *joined_value = NULL, *_SERVER;
 	zval *key_server = NULL, *files, *key_file = NULL;
 	zval *memory, *data_var = NULL, *key_var = NULL, *variable = NULL, *dumped_argument = NULL;
 	zval *js_sources;
@@ -1111,12 +1111,16 @@ PHP_METHOD(Phalcon_Debug, onUncaughtException){
 		phalcon_is_iterable(_REQUEST, &ah1, &hp1, 0, 0);
 
 		while (zend_hash_get_current_data_ex(ah1, (void**) &hd, &hp1) == SUCCESS) {
-
 			PHALCON_GET_HKEY(key_request, ah1, hp1);
 			PHALCON_GET_HVALUE(value);
-
-			PHALCON_SCONCAT_SVSVS(html, "<tr><td class=\"key\">", key_request, "</td><td>", value, "</td></tr>");
-
+
+			if (Z_TYPE_P(value) == IS_ARRAY) {
+				PHALCON_INIT_NVAR(joined_value);
+				phalcon_call_method_p1(joined_value, this_ptr, "_getvardump", value);
+				PHALCON_SCONCAT_SVSVS(html, "<tr><td class=\"key\">", key_request, "</td><td>", joined_value, "</td></tr>");
+			} else {
+				PHALCON_SCONCAT_SVSVS(html, "<tr><td class=\"key\">", key_request, "</td><td>", value, "</td></tr>");
+			}
 			zend_hash_move_forward_ex(ah1, &hp1);
 		}
 

diff --git a/ext/image/adapter.c b/ext/image/adapter.c
@@ -702,7 +702,7 @@ PHP_METHOD(Phalcon_Image_Adapter, watermark){
 PHP_METHOD(Phalcon_Image_Adapter, text){
 
 	zval *text, *offset_x = NULL, *offset_y = NULL, *opacity = NULL, *color = NULL, *size = NULL, *fontfile = NULL;
-	zval *tmp_color = NULL, *pattern, *replacement, *r, *g, *b;
+	zval *tmp_color = NULL, *r, *g, *b;
 	int i;
 	char *c;
 

diff --git a/ext/image/adapter/gd.c b/ext/image/adapter/gd.c
@@ -81,7 +81,7 @@ PHALCON_INIT_CLASS(Phalcon_Image_Adapter_GD){
  */
 PHP_METHOD(Phalcon_Image_Adapter_GD, check){
 
-	zval *func_name, *ret, *gd_info, *gd_version, *version, *exception_message;
+	zval *ret, *gd_info, *gd_version, *version, *exception_message;
 	zval *pattern, *matches;
 	int rc;
 
@@ -570,7 +570,7 @@ PHP_METHOD(Phalcon_Image_Adapter_GD, _flip) {
  */
 PHP_METHOD(Phalcon_Image_Adapter_GD, _sharpen) {
 
-	zval *amount, *tmp = NULL, *tmp_amount = NULL, *precision, *matrix, *item = NULL;
+	zval *amount, *tmp = NULL, *tmp_amount = NULL, *matrix, *item = NULL;
 	zval *image = NULL, *ret, *width = NULL, *height = NULL;
 	int a;
 	double b;