summaryrefslogtreecommitdiff
path: root/lib/util.php
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@controlyourself.ca>2009-04-02 06:44:54 +0000
committerSarven Capadisli <csarven@controlyourself.ca>2009-04-02 06:44:54 +0000
commit798984381f9ee40681d1feb4a7bef72460fe39f2 (patch)
tree8bcf6b27a9efe7f53a2b1e5fd23d7f4f2789bc51 /lib/util.php
parent928d3bd68c62d2e35594fb4196216e1f9fd363a2 (diff)
parent36f73bffbc717d895370e905070c310062127529 (diff)
Merge branch '0.7.x' into 0.8.x
Diffstat (limited to 'lib/util.php')
-rw-r--r--lib/util.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/util.php b/lib/util.php
index fdcae0aca..f08e70754 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -850,7 +850,7 @@ function common_redirect($url, $code=307)
303 => "See Other",
307 => "Temporary Redirect");
- header("Status: ${code} $status[$code]");
+ header('HTTP/1.1 '.$code.' '.$status[$code]);
header("Location: $url");
$xo = new XMLOutputter();
@@ -952,9 +952,9 @@ function common_profile_url($nickname)
// Should make up a reasonable root URL
-function common_root_url()
+function common_root_url($ssl=false)
{
- return common_path('');
+ return common_path('', $ssl);
}
// returns $bytes bytes of random data as a hexadecimal string