[Koha-bugs] [Bug 11358] Use Amazon's HTTPS URLs for covers when using HTTPS in Koha.

[bugzilla-daemon at bugs.koha-community.org]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11358

Koha Team Lyon 3 <koha at univ-lyon3.fr> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |koha at univ-lyon3.fr

--- Comment #4 from Koha Team Lyon 3 <koha at univ-lyon3.fr> ---
<h1>Something went wrong !</h1>Applying: Use HTTPS Amazon images when Koha is
using HTTPS.
Using index info to reconstruct a base tree...
<stdin>:67: trailing whitespace.
        if ((this.src.indexOf('images.amazon.com') >= 0) ||
(this.src.indexOf('g-images.amazon.com') >=0) 
<stdin>:68: trailing whitespace.
        || (this.src.indexOf('syndetics.com') >=0) ||
(this.src.indexOf('images-na.ssl-images-amazon.com') >= 0)) { 
<stdin>:227: trailing whitespace.
        if ((this.src.indexOf('images.amazon.com') >= 0) ||
(this.src.indexOf('g-images.amazon.com') >=0) 
<stdin>:228: trailing whitespace.
        || (this.src.indexOf('syndetics.com') >=0) ||
(this.src.indexOf('images-na.ssl-images-amazon.com') >= 0)) { 
<stdin>:253: trailing whitespace.
        if ((this.src.indexOf('images.amazon.com') >= 0) ||
(this.src.indexOf('g-images.amazon.com') >=0) 
warning: squelched 3 whitespace errors
warning: 8 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-opensearch.tt
Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt
Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt
Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
 .

-- 
You are receiving this mail because:
You are watching all bug changes.