Permalink
Browse files

Merge remote-tracking branch 'upstream/develop' into develop

  • Loading branch information...
2 parents d3d344d + 6fc02d9 commit 3d95fd76147f6dce67d3043f6cdf9c38dc49913a @caseysoftware caseysoftware committed Jan 18, 2013
Showing with 14 additions and 4 deletions.
  1. +5 −0 CHANGELOG.markdown
  2. +9 −4 OpenVBX/controllers/install.php
View
@@ -2,6 +2,11 @@
## OpenVBX 1.2.12
+- Send proper JSON header during install steps.
+
+
+## OpenVBX 1.2.12
+
- Fix cache table `value` field to be `mediumblob` instead of `text`. Fixes an issue where large lists of phone numbers (300+) would overflow the value field and corrupt the cached data.
- Fix exception with latest versions of PHP when a default timezone is not set.
- Fix Github API request for upgrade version check to use Github API V3.
@@ -286,7 +286,7 @@ public function setup()
$json['step'] = $e->getCode();
}
- echo json_encode($json);
+ $this->json_return($json);
}
private function setup_connect_app($settings)
@@ -568,8 +568,7 @@ function validate()
if($step == 1)
{
- echo json_encode($json);
- return;
+ $this->json_return($json);
}
$tplvars = $this->input_args();
@@ -591,7 +590,7 @@ function validate()
}
$json['tplvars'] = $tplvars;
- echo json_encode($json);
+ $this->json_return($json);
}
function validate_step2()
@@ -819,4 +818,10 @@ protected function pre_test_htaccess()
log_message($message);
}
}
+
+ protected function json_return($data) {
+ header('Content-type: application/json');
+ echo json_encode($data);
+ exit;
+ }
}

0 comments on commit 3d95fd7

Please sign in to comment.