Changeset 728 for team

Show
Ignore:
Timestamp:
12/09/07 19:00:11 (13 months ago)
Author:
www-data
Message:

automerge commit

Location:
team/michiel/input_formats
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • team/michiel/input_formats

    • Property svnmerge-integrated changed from /trunk:1-725 to /trunk:1-727
  • team/michiel/input_formats/common/mvblog.php

    r682 r728  
    764764                        <?php 
    765765                } else { 
    766                         if ($_SESSION["author_name"]) { 
     766                        if (array_key_exists("author_name", $_SESSION) && $_SESSION["author_name"]) { 
    767767                                $realname = htmlspecialchars(stripslashes($_SESSION["author_fullname"])); 
    768768                        } else { 
     
    12361236                ); 
    12371237                $this->db->exec($sql); 
    1238                 if ($_SERVER["HTTPS"] == "on") 
     1238                if (array_key_exists("HTTPS", $_SERVER) && $_SERVER["HTTPS"] == "on") 
    12391239                        $proto = "https"; 
    12401240                else