diff options
author | Ralph Amissah <ralph@amissah.com> | 2010-03-17 15:43:23 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2010-03-17 15:43:23 -0400 |
commit | 3a05470820f9bc3a88eeb6eb97599a8eb895f325 (patch) | |
tree | cba8ea1ed592d7a3fb3c6199035d2caf6d985ce5 /lib/sisu/v2/html_promo.rb | |
parent | debian: NEWS.Debian, changelog, control, sisu.install, sisu.lintian-overrides... (diff) | |
parent | plaintext docoration (more flexible markings) (diff) |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v2/html_promo.rb')
-rw-r--r-- | lib/sisu/v2/html_promo.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/sisu/v2/html_promo.rb b/lib/sisu/v2/html_promo.rb index 962184f2..df13393e 100644 --- a/lib/sisu/v2/html_promo.rb +++ b/lib/sisu/v2/html_promo.rb @@ -146,10 +146,12 @@ module SiSU_HTML_promo end def search_form_sisu(table=true) db=if @prod['db']=~/\S+/ - (@prod['db']=~/^SiSU_\S+/) ? @prod['db'] : "SiSU_#{@prod['db']}" + (@prod['db']=~/^#{Db[:name_prefix]}\S+/) ? @prod['db'] : "#{Db[:name_prefix]}#{@prod['db']}" elsif defined? @rc['search']['sisu']['db'] \ and @rc['search']['sisu']['db'] =~/\S+/ - (@rc['search']['sisu']['db']=~/^SiSU_\S+/) ? @prod['search']['sisu']['db'] : "SiSU_#{@prod['db']}" + (@rc['search']['sisu']['db']=~/^#{Db[:name_prefix]}\S+/) \ + ? @prod['search']['sisu']['db'] \ + : "#{Db[:name_prefix]}#{@prod['db']}" else nil end action=if @prod['action']=~/^http:\/\// |