Add error check for null header image property.

        Patch by afuna. 

diffs (24 lines):

diff -r 67e1042df080 -r 0f09c83ba2d1 bin/upgrading/s2layers/colorside/layout.s2
--- a/bin/upgrading/s2layers/colorside/layout.s2        Sun Aug 16 12:16:36 
2009 +0000
+++ b/bin/upgrading/s2layers/colorside/layout.s2        Mon Aug 17 13:40:10 
2009 -0500
@@ -8,7 +8,7 @@ set layout_type = "two-columns-right";
 set layout_type = "two-columns-right";
 
 function prop_init {
-    if ( not $*image_background_header_url->starts_with("http")  ) {
+    if ( $*image_background_header_url != "" and not 
$*image_background_header_url->starts_with("http")  ) {
         $*image_background_header_url = 
"$*STATDIR/$*image_background_header_url";
     }
 }
diff -r 67e1042df080 -r 0f09c83ba2d1 bin/upgrading/s2layers/modish/layout.s2
--- a/bin/upgrading/s2layers/modish/layout.s2   Sun Aug 16 12:16:36 2009 +0000
+++ b/bin/upgrading/s2layers/modish/layout.s2   Mon Aug 17 13:40:10 2009 -0500
@@ -8,7 +8,7 @@ set layout_type = "two-columns-left";
 set layout_type = "two-columns-left";
 
 function prop_init {
-    if ( not $*image_background_header_url->starts_with("http")  ) {
+    if ( $*image_background_header_url != "" and not 
$*image_background_header_url->starts_with("http")  ) {
         $*image_background_header_url = 
"$*STATDIR/$*image_background_header_url";
     }
 }
_______________________________________________
dw-changelog mailing list
[email protected]
http://lists.dwscoalition.org/mailman/listinfo/dw-changelog

Reply via email to