Merge lp://staging/~submarine/unity-scope-zotero/bug1174987 into lp://staging/unity-scope-zotero
Proposed by
Mark Tully
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | David Callé | ||||
| Approved revision: | 24 | ||||
| Merged at revision: | 24 | ||||
| Proposed branch: | lp://staging/~submarine/unity-scope-zotero/bug1174987 | ||||
| Merge into: | lp://staging/unity-scope-zotero | ||||
| Diff against target: |
144 lines (+31/-18) 3 files modified
.bzrignore (+5/-0) po/unity-scope-zotero.pot (+15/-6) src/unity_zotero_daemon.py (+11/-12) |
||||
| To merge this branch: | bzr merge lp://staging/~submarine/unity-scope-zotero/bug1174987 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| David Callé (community) | Approve | ||
| PS Jenkins bot (community) | continuous-integration | Approve | |
|
Review via email:
|
|||
Commit message
Updates SQL query to take into account zotero attachments
Description of the change
Updating SQL query to take into account that in Zotero 4, urls may not be included in the main entry of an article, but rather in an attachment. The query now uses the url in the article entry if it exists, or else uses the first url in the attachments.
Also escaping forbidden characters in the preview description which was preventing it from being displayed if the forbidden characters were in the description.
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
PASSED: Continuous integration, rev:24
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://