[Koha-bugs] [Bug 4289] Add a syspref 'OpacPublic', to hide OPAC search-bar and force authentication on all OPAC pages

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

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

Nicole C. Engard <nengard at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |nengard at gmail.com
       Patch Status|Needs Signoff               |Does not apply

--- Comment #8 from Nicole C. Engard <nengard at gmail.com> 2010-12-16 21:01:38 UTC ---
Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying Bug 4289: 'OpacPublic' feature
error: patch failed: installer/data/mysql/updatedatabase.pl:3876
error: installer/data/mysql/updatedatabase.pl: patch does not apply
error: patch failed: opac/opac-showreviews.pl:34
error: opac/opac-showreviews.pl: patch does not apply
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merged C4/Auth.pm
Auto-merged installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merged koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
Auto-merged opac/opac-detail.pl
Auto-merged opac/opac-search.pl
Auto-merged opac/opac-showreviews.pl
Auto-merged opac/opac-suggestions.pl
Auto-merged opac/opac-userupdate.pl
Failed to merge in the changes.
Patch failed at 0001.
When you have resolved this problem run "git-am -i -3 --resolved".
If you would prefer to skip this patch, instead run "git-am -i -3 --skip".
nengard at debian:~/kohaclone$

-- 
Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the QA contact for the bug.