[dw-free] When header image property is blank, Modish and ColorSide try to use the directory URL as

[kareila]

[commit: http://hg.dwscoalition.org/dw-free/rev/0f09c83ba2d1]

http://bugs.dwscoalition.org/show_bug.cgi?id=1618

Add error check for null header image property.

Patch by afuna.

Files modified:

• bin/upgrading/s2layers/colorside/layout.s2
• bin/upgrading/s2layers/modish/layout.s2

--------------------------------------------------------------------------------
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";
     }
 }
--------------------------------------------------------------------------------