Changeset 21248


Ignore:
Timestamp:
2011/09/22 15:39:55 (9 years ago)
Author:
nanasess
bzr:base-revision:
svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_11-dev:21247
bzr:committer:
Kentaro Ohkouchi <ohkouchi@loop-az.jp>
bzr:file-ids:

data/class/pages/admin/LC_Page_Admin.php 15280@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2FLC_Page_Admin.php
bzr:mapping-version:
v4
bzr:merge:

ohkouchi@loop-az.jp-20110922063859-jclx7yddj00o9b9i
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
ohkouchi@loop-az.jp-20110922063950-3irgg9tq29zerzzo
bzr:revno:
3946
bzr:revprop:branch-nick:
branches/version-2_11-dev
bzr:root:
branches/version-2_11-dev
bzr:testament:

bazaar-ng testament short form 2.1
revision-id: ohkouchi@loop-az.jp-20110922063950-3irgg9tq29zerzzo
sha1: ed396a2b4f4f046cb638b6fec74baa412be39574
bzr:text-parents:

data/class/pages/admin/LC_Page_Admin.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_11-dev:21027
bzr:timestamp:
2011-09-22 15:39:50.336999893 +0900
bzr:user-agent:
bzr2.4.1+bzr-svn1.1.0
Message:

#1210 (「SSLを強制」時のポートが 443 固定)

  • typo も共に修正
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_11-dev/data/class/pages/admin/LC_Page_Admin.php

    r21027 r21248  
    5555        //SSL制限チェック 
    5656        if(ADMIN_FORCE_SSL == TRUE){ 
    57             if(empty($_SERVER['HTTPS']) AND $_SERVER['SERVER_PORT'] != 443){ 
    58                 SC_Response_Ex::sendRedirect($SERVER["REQUEST_URI"], $_GET,FALSE, TRUE); 
     57            if (SC_Utils_Ex::sfIsHTTPS() === false){ 
     58                SC_Response_Ex::sendRedirect($_SERVER["REQUEST_URI"], $_GET, FALSE, TRUE); 
    5959            } 
    6060        } 
Note: See TracChangeset for help on using the changeset viewer.