From 48205e31a032c9a37807cd769f1c0aac4502d860 Mon Sep 17 00:00:00 2001
From: George Clark <geonwiki@fenachrone.com>
Date: Sat, 10 Jan 2015 22:22:05 -0500
Subject: [PATCH] Item13186: Still unable to save the configuration

 - Probably a copy/paste error.

 Also, avoid undef errors in the bootstrap trace logs.
---
 core/lib/Foswiki/Configure/Load.pm         | 4 +++-
 core/lib/Foswiki/Configure/Wizards/Save.pm | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/lib/Foswiki/Configure/Load.pm b/core/lib/Foswiki/Configure/Load.pm
index c130824e37..5a7c6a7cb2 100644
--- a/core/lib/Foswiki/Configure/Load.pm
+++ b/core/lib/Foswiki/Configure/Load.pm
@@ -646,7 +646,9 @@ sub _bootstrapWebSettings {
 # configuration, then it will not be set correctly.
     my $path_info = $ENV{'PATH_INFO'}
       || '';    #SMELL Sometimes PATH_INFO appears to be undefined.
-    print STDERR "AUTOCONFIG: REQUEST_URI is $ENV{REQUEST_URI} \n" if (TRAUTO);
+    print STDERR "AUTOCONFIG: REQUEST_URI is "
+      . ( $ENV{REQUEST_URI} || '(undef)' ) . "\n"
+      if (TRAUTO);
     print STDERR "AUTOCONFIG: SCRIPT_URI  is "
       . ( $ENV{SCRIPT_URI} || '(undef)' ) . " \n"
       if (TRAUTO);
diff --git a/core/lib/Foswiki/Configure/Wizards/Save.pm b/core/lib/Foswiki/Configure/Wizards/Save.pm
index 0acae36ea0..cfacad914e 100644
--- a/core/lib/Foswiki/Configure/Wizards/Save.pm
+++ b/core/lib/Foswiki/Configure/Wizards/Save.pm
@@ -430,14 +430,14 @@ sub _generateLSC {
 
             # An undef value and undefok will suppress the item in LSC
             return ()
-              if ( $vs->{item}->CHECK_option('undefok') );
+              if ( $vs->CHECK_option('undefok') );
 
         }
         elsif ( $datum eq '' ) {
 
             # Treat '' as undef unless emptyok
             return ()
-              if ( $vs->{item}->CHECK_option('emptyok') );
+              unless ( $vs->CHECK_option('emptyok') );
         }
         my $d = Foswiki::Configure::Reporter::uneval($datum);
         push( @dump, "\$Foswiki::cfg$keys = $d;\n" );