Merge branch 'upstream' into debian/sid

1 files changed, 5 insertions, 5 deletions

diff --git a/lib/sisu/v2/html_promo.rb b/lib/sisu/v2/html_promo.rb
index 92ea15ec..0b3e500a 100644
--- a/lib/sisu/v2/html_promo.rb
+++ b/lib/sisu/v2/html_promo.rb
@@ -154,10 +154,10 @@ module SiSU_HTML_promo
           : "#{Db[:name_prefix]}#{@prod['db']}"
         else nil
         end
-        action=if @prod['action']=~/^http:\/\//
+        action=if @prod['action']=~/^https?:\/\//
           @prod['action']
         elsif defined? @rc['search']['sisu']['action'] \
-        and @rc['search']['sisu']['action'] =~/^http:\/\//
+        and @rc['search']['sisu']['action'] =~/^https?:\/\//
           @rc['search']['sisu']['action']
         else nil
         end
@@ -169,7 +169,7 @@ module SiSU_HTML_promo
       end
       def search_form_hyperestraier(table=true)
         action=if defined? @rc['search']['hyperestraier']['action'] \
-        and @rc['search']['hyperestraier']['action'] =~/^http:\/\//
+        and @rc['search']['hyperestraier']['action'] =~/^https?:\/\//
           @rc['search']['hyperestraier']['action']
         else nil
         end
@@ -187,7 +187,7 @@ module SiSU_HTML_promo
             and x['url'] \
             and x['title']
               subtitle=x['subtitle'] ? %{ - #{x['subtitle']}} : ''
-              url_=(x['url'] =~/http:/) ? x['url'] : "../#{x['url']}"
+              url_=(x['url'] =~/https?:/) ? x['url'] : "../#{x['url']}"
               links_a << %{<p class="pane_link"><a href="#{url_}">#{x['title']}#{subtitle}</a></p>\n}
             end
           end
@@ -199,7 +199,7 @@ module SiSU_HTML_promo
         @prod['image'] ? %{<img border="0" src="../_sisu/image/#{@prod['image']}" /><br />} : ''
       end
       def url_link
-        @url_=if @prod['url'] =~/http:/
+        @url_=if @prod['url'] =~/https?:/
           "#{@prod['url']}"
         else "../#{@prod['url']}" # "#{@env.url.root}/#{@prod['url']}"
         end