Skip to content

corrected a variable check #227

Closed
wants to merge 13 commits into from
View
2 CHANGELOG.markdown
@@ -1,6 +1,6 @@
# OpenVBX Change Log
-## Next
+## OpenVBX 1.2.12
- Send proper JSON header during install steps.
View
7 OpenVBX/libraries/OpenVBX.php
@@ -224,7 +224,7 @@ public static function schemaVersion()
if ($ci->db)
{
$ci->load->model('vbx_settings');
- if (!$cache && $ci->cache->enabled())
+ if (!$ci->cache && $ci->cache->enabled())
{
$ci->cache->enabled(false);
$reenable_cache = true;
@@ -445,7 +445,8 @@ public static function validateRequest($url = false, $post_vars = false)
// without rewrite enabled we need to ensure that the query string
// is properly appended to the url when being reconstructed
- if (!empty($_SERVER['QUERY_STRING']) && strpos($url, $_SERVER['QUERY_STRING']) === false)
+ if ($ci->vbx_settings->get('rewrite_enabled', VBX_PARENT_TENANT) < 1 &&
+ !empty($_SERVER['QUERY_STRING']) && strpos($url, $_SERVER['QUERY_STRING']) === false)
{
$qs = parse_str($_SERVER['QUERY_STRING']);
@@ -469,7 +470,7 @@ public static function validateRequest($url = false, $post_vars = false)
// we weren't handed post-vars, use the default
$post_vars = $_POST;
}
-
+
return self::$_twilioValidator->validate(self::getRequestSignature(), $url, $post_vars);
}
Something went wrong with that request. Please try again.