Changeset 158

Show
Ignore:
Timestamp:
02/20/07 13:25:36 (2 years ago)
Author:
ingy
Message:
 r3428@skinny:  ingy | 2007-02-20 13:25:25 -0800
 Only set env variables that are not set.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/src/core/Kwiki/kwiki

    r157 r158  
    3535    my $fh; 
    3636    for (@env_files) { open $fh, $_ and last } 
    37     do { $ENV{$1} = $2 if /^(\w+)\s*=\s*['"]?(.*?)['"]?\s*$/ } for <$fh>; 
     37    do { $ENV{$1} ||= $2 if /^(\w+)\s*=\s*['"]?(.*?)['"]?\s*$/ } for <$fh>; 
    3838 
    3939    if ($ENV{KWIKI_TEST_CLEAN}) { 
  • trunk/src/core/Kwiki/lib/Kwiki/Files.pm

    r157 r158  
    1414    my $fh; 
    1515    for (qw(_kwiki .ht_kwiki)) { open $fh, $_ and last } 
    16     do { $ENV{$1} = $2 if /^(\w+)\s*=\s*['"]?(.*?)['"]?\s*$/ } for <$fh>; 
     16    do { $ENV{$1} ||= $2 if /^(\w+)\s*=\s*['"]?(.*?)['"]?\s*$/ } for <$fh>; 
    1717} 
    1818use lib grep { -e } split /:/, $ENV{KWIKI_LIB_PATH} || 'lib'; 
  • trunk/src/core/Kwiki/src/index.cgi

    r157 r158  
    44    my $fh; 
    55    for (qw(_kwiki .ht_kwiki)) { open $fh, $_ and last } 
    6     do { $ENV{$1} = $2 if /^(\w+)\s*=\s*['"]?(.*?)['"]?\s*$/ } for <$fh>; 
     6    do { $ENV{$1} ||= $2 if /^(\w+)\s*=\s*['"]?(.*?)['"]?\s*$/ } for <$fh>; 
    77} 
    88use lib grep { -e } split /:/, $ENV{KWIKI_LIB_PATH} || 'lib'; 
  • trunk/src/plugins/miyagawa/Kwiki-FastCGI/lib/Kwiki/FastCGI.pm

    r157 r158  
    4747    my $fh; 
    4848    for (qw(_kwiki .ht_kwiki)) { open $fh, $_ and last } 
    49     do { $ENV{$1} = $2 if /^(\w+)\s*=\s*['"]?(.*?)['"]?\s*$/ } for <$fh>; 
     49    do { $ENV{$1} ||= $2 if /^(\w+)\s*=\s*['"]?(.*?)['"]?\s*$/ } for <$fh>; 
    5050} 
    5151use lib grep { -e } split /:/, $ENV{KWIKI_LIB_PATH} || 'lib';