Midori Web Browser

Merge lp:~aauzi/midori/fix-1195476 into lp:midori

  1. fix-1195476
  2. Merge into trunk
Proposed by André Auzi
Status: Merged
Approved by: André Stösel
Approved revision: 6253
Merged at revision: 6253
Proposed branch: lp:~aauzi/midori/fix-1195476
Merge into: lp:midori
Diff against target: 12 lines (+1/-1)
1 file modified
midori/midori-historycompletion.vala (+1/-1)
To merge this branch: bzr merge lp:~aauzi/midori/fix-1195476
Reviewer Review Type Date Requested Status
André Stösel Approve
Review via email: mp+173783@code.launchpad.net

Commit message

Avoid selecting bookmark uris that begin by 'javascript:' for completion

To post a comment you must log in.
Revision history for this message
André Stösel (ivaldi) wrote :

If we don't use such urls why log them in the first place?

Revision history for this message
André Stösel (ivaldi) wrote :

Nevermind

Revision history for this message
André Stösel (ivaldi) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'midori/midori-historycompletion.vala'
2--- midori/midori-historycompletion.vala 2013-05-19 09:43:05 +0000
3+++ midori/midori-historycompletion.vala 2013-07-09 17:37:54 +0000
4@@ -47,7 +47,7 @@
5 WHERE uri LIKE ?1 OR title LIKE ?1 GROUP BY uri
6 UNION ALL
7 SELECT 1 AS type, uri, title, 50 AS ct FROM bookmarks
8- WHERE title LIKE ?1 OR uri LIKE ?1 AND uri !=''
9+ WHERE title LIKE ?1 OR uri LIKE ?1 AND uri !='' AND uri NOT LIKE 'javascript:%'
10 ) GROUP BY uri ORDER BY ct DESC LIMIT ?2
11 """;
12 if (db.prepare_v2 (sqlcmd, -1, out stmt, null) != Sqlite.OK) {

Subscribers

People subscribed via source and target branches

to all changes: