diff options
| author | Ralph Amissah <ralph@amissah.com> | 2007-10-15 19:27:27 +0100 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2007-10-15 19:27:27 +0100 |
| commit | 7330cf6ae4fa17e3f6d9914ead719655ebbe590b (patch) | |
| tree | 1f7253a22872ca2501d7aefc2a48b9b2df65f7f4 /lib/sisu/v0/cgi_sql_common.rb | |
| parent | debian/control add depends on rsync (diff) | |
| parent | mostly the arrangement of conditionals (diff) | |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v0/cgi_sql_common.rb')
| -rw-r--r-- | lib/sisu/v0/cgi_sql_common.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/sisu/v0/cgi_sql_common.rb b/lib/sisu/v0/cgi_sql_common.rb index 73cb2342..7df73901 100644 --- a/lib/sisu/v0/cgi_sql_common.rb +++ b/lib/sisu/v0/cgi_sql_common.rb @@ -815,9 +815,12 @@ module SiSU_CGI_sql if @text_search_flag if cgi['view']=~/text/ #% txt body text=if c['suffix'] !~/1/ #seg - if @search_for.text1 =~/\S+/ or q['s1'] =~/\S+/ #% only this branch is working !! - unescaped_search=if @search_for.text1 =~/\S+/; CGI.unescape(@search_for.text1) - elsif q['s1'] =~/\S+/; CGI.unescape(q['s1']) + if @search_for.text1 =~/\S+/ \ + or q['s1'] =~/\S+/ #% only this branch is working !! + unescaped_search=if @search_for.text1 =~/\S+/ + CGI.unescape(@search_for.text1) + elsif q['s1'] =~/\S+/ + CGI.unescape(q['s1']) else nil end @search_regx=if unescaped_search #check |