joshtronic/pickles
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:joshtronic/pickles

Browse source
This commit is contained in:
Josh Sherman 2012-12-14 15:58:30 -05:00
commit 63fd4db19a
3 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
classes/Browser.php
View file

@ -53,7 +53,7 @@ class Browser
{ {
if (strpos($destination, '://') === false) if (strpos($destination, '://') === false)
{ {
$destination = 'http' . ((!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] == 'off') ? '' : 's') . '://' . $_SERVER['HTTP_HOST'] . $destination; $destination = 'http' . ((!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] == 'off' || $_SERVER['HTTPS'] == '') ? '' : 's') . '://' . $_SERVER['HTTP_HOST'] . $destination;
} }
header('Location: ' . $destination); header('Location: ' . $destination);

4
classes/Controller.php
View file

@ -389,6 +389,10 @@ class Controller extends Object
{ {
$module_return = $module->return; $module_return = $module->return;
} }
else
{
$module_return = array_merge($module_return, $module->return);
}
} }
$display->setModuleReturn(isset($module_return) ? $module_return : array('status' => 'error', 'message' => $error_message)); $display->setModuleReturn(isset($module_return) ? $module_return : array('status' => 'error', 'message' => $error_message));

6
jar.php
View file

@ -358,7 +358,7 @@ class Browser
{ {
if (strpos($destination, '://') === false) if (strpos($destination, '://') === false)
{ {
$destination = 'http' . ((!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] == 'off') ? '' : 's') . '://' . $_SERVER['HTTP_HOST'] . $destination; $destination = 'http' . ((!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] == 'off' || $_SERVER['HTTPS'] == '') ? '' : 's') . '://' . $_SERVER['HTTP_HOST'] . $destination;
} }
header('Location: ' . $destination); header('Location: ' . $destination);
@ -1417,6 +1417,10 @@ class Controller extends Object
{ {
$module_return = $module->return; $module_return = $module->return;
} }
else
{
$module_return = array_merge($module_return, $module->return);
}
} }
$display->setModuleReturn(isset($module_return) ? $module_return : array('status' => 'error', 'message' => $error_message)); $display->setModuleReturn(isset($module_return) ? $module_return : array('status' => 'error', 'message' => $error_message));