projects / catagits/Catalyst-Action-Serialize-Data-Serializer.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw
Updating my email address
[catagits/Catalyst-Action-Serialize-Data-Serializer.git] / lib / Catalyst / Action / Serialize / YAML / HTML.pm
diff --git a/lib/Catalyst/Action/Serialize/YAML/HTML.pm b/lib/Catalyst/Action/Serialize/YAML/HTML.pm
index 54791b4..d6bdded 100644 (file)
--- a/lib/Catalyst/Action/Serialize/YAML/HTML.pm
+++ b/lib/Catalyst/Action/Serialize/YAML/HTML.pm
@@ -1,6 +1,6 @@
 #
 # Catlyst::Action::Serialize::YAML::HTML.pm
-# Created by: Adam Jacob, Marchex, <adam@marchex.com>
+# Created by: Adam Jacob, Marchex, <adam@hjksolutions.com>
 # Created on: 10/12/2006 03:00:32 PM PDT
 #
 # $Id$
@@ -18,7 +18,11 @@ sub execute {
     my $self = shift;
     my ( $controller, $c ) = @_;
 
-    my $stash_key = $controller->config->{'serialize'}->{'stash_key'} || 'rest';
+    my $stash_key = (
+            $controller->config->{'serialize'} ?
+                $controller->config->{'serialize'}->{'stash_key'} :
+                $controller->config->{'stash_key'} 
+        ) || 'rest';
     my $app = $c->config->{'name'} || '';
     my $output = "<html>";
     $output .= "<title>" . $app . "</title>";
@@ -29,7 +33,7 @@ sub execute {
                               sub {
                                   my($uri, $orig_uri) = @_;
                                   my $newuri;
-                                  if ($uri =~ /?/) {
+                                  if ($uri =~ /\?/) {
                                       $newuri = $uri . "&content-type=text/html";
                                   } else {
                                       $newuri = $uri . "?content-type=text/html";
git://git.shadowcat.co.uk:catagits/Catalyst-Action-Serialize-Data-Serializer