[svn:p5ee] r13299 - p5ee/trunk/App-Context/lib/App

[spadkins]

Author: spadkins
Date: Thu Sep 10 13:25:25 2009
New Revision: 13299

Modified:
   p5ee/trunk/App-Context/lib/App/Context.pm

Log:
Fixed bug with a defined variable

Modified: p5ee/trunk/App-Context/lib/App/Context.pm
==============================================================================
--- p5ee/trunk/App-Context/lib/App/Context.pm   (original)
+++ p5ee/trunk/App-Context/lib/App/Context.pm   Thu Sep 10 13:25:25 2009
@@ -1142,7 +1142,7 @@
             $cached_service = $self->session_object($name);
         }
         $value = $cached_service->{$var};
-        if (!defined $value && defined $default) {
+        if ((!defined $value || $value eq "") && defined $default) {
             $value = $default;
             if ($setdefault) {
                 $self->{session}{store}{SessionObject}{$name}{$var} = $value;
@@ -1182,7 +1182,6 @@
         $self->dbgprint("Context->so_get($name,$var) (indexed) = [$value]")
             if ($App::DEBUG && $self->dbg(3));
     }
-
     &App::sub_exit($value) if ($App::trace);
     return $value;
 }
@@ -1494,6 +1493,7 @@
         $value = "" if (!defined $value);
         $text =~ s/\{$var\}/$value/g;
     }
+
     &App::sub_exit($text) if ($App::trace);
     $text;
 }