diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2010-06-18 15:20:32 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2010-06-18 15:20:32 -0700 |
| commit | ec40e03a377a8a5cd74b448135307c77a2b9e0e9 (patch) | |
| tree | c0cba6716f4487c057c33951333a2696fa4ca541 | |
| parent | b1a6fd3e596ebee6714b37c9a108fafac377a540 (diff) | |
Use request::protocol().
| -rw-r--r-- | modules/organize/controllers/organize.php | 2 | ||||
| -rw-r--r-- | modules/organize/views/organize_dialog.html.php | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php index 1d188ade..e8db991b 100644 --- a/modules/organize/controllers/organize.php +++ b/modules/organize/controllers/organize.php @@ -33,8 +33,6 @@ class Organize_Controller extends Controller { $user = identity::active_user(); $v->access_key = rest::get_access_key($user->id)->access_key; - $v->protocol = (empty($_SERVER["HTTPS"]) OR $_SERVER["HTTPS"] === "off") ? "http" : "https"; - $v->file_filter = addslashes(json_encode( array("photo" => array("label" => "Images", "types" => array("*.jpg", "*.jpeg", "*.png", "*.gif")), diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php index 4224c10b..9e70d168 100644 --- a/modules/organize/views/organize_dialog.html.php +++ b/modules/organize/views/organize_dialog.html.php @@ -91,7 +91,7 @@ dialogHeight: $("#g-dialog").height(), domain: "<?= $domain ?>", accessKey: "<?= $access_key ?>", - protocol: "<?= $protocol ?>", + protocol: "<?= request::protocol() ?>", fileFilter: "<?= $file_filter ?>", sortOrder: "<?= $sort_order ?>", sortFields: "<?= $sort_fields ?>", |