← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/kde4libs/oneiric-security

« back to all changes in this revision

Viewing changes to khtml/khtml_filter.cpp

  • Committer: Package Import Robot
  • Author(s): Michał Zając, Michał Zając, Jonathan Riddell
  • Date: 2011-02-27 14:10:59 UTC
  • mfrom: (1.14.3 upstream)
  • Revision ID: package-import@ubuntu.com-20110227141059-asgzcw48ao08rvkp
Tags: 4:4.6.1-0ubuntu1
[ Michał Zając ]
* New upstream release
* Refreshed kubuntu_06_user_disk_mounting.diff
* Refreshed kubuntu_77_ksambashare.diff
* Refreshed *.install files

[ Jonathan Riddell ]
* Add back kubuntu_77_no_kbookmark_write_error.diff workaround for LP:
  #627815

Show diffs side-by-side

added added

removed removed

Lines of Context:
khtml/khtml_filter.cpp
74
74
 
75
75
    // Strip options, we ignore them for now.
76
76
    int dollar = filter.lastIndexOf(QLatin1Char('$'));
77
 
    if (dollar != -1)
 
77
    if (dollar != -1) {
78
78
        last = dollar - 1;
 
79
        // If only "*" is left after ignoring the options, disregard the rule.
 
80
        if (first == last && firstChar == QLatin1Char('*'))
 
81
            return;
 
82
    }
79
83
 
80
84
    // Perhaps nothing left?
81
85
    if (first > last)