From 7de7d4095a6092bc4b3dacd1f2e3b5c616fc572f Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Mon, 2 Mar 2020 14:58:15 +0000
Subject: [PATCH] Bug 4461: Remove hard requirement on OpacKohaUrl

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 .../opac-tmpl/bootstrap/en/includes/opac-bottom.inc  | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
index fac2ca93df..ab70113b59 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
@@ -16,15 +16,16 @@
         </div>
     [% END #/ opaccredits %]
 
-    [% IF ( OpacKohaUrl ) %]
+    [% IF ( Koha.Preference('OPACReportProblem') || OpacKohaUrl ) %]
         <div class="container-fluid">
             <div class="row-fluid">
                 <div class="span12">
                     [% IF Koha.Preference('OPACReportProblem') %]
-                        <div id="report_a_problem" class="noprint" style="float:left;">
-                            <a class="koha-url" href="/cgi-bin/koha/opac-reportproblem.pl">Report a problem</a>
-                        </div>
+                    <div id="report_a_problem" class="noprint" style="float:left;">
+                        <a class="koha-url" href="/cgi-bin/koha/opac-reportproblem.pl">Report a problem</a>
+                    </div>
                     [% END %]
+                    [% IF OpacKohaUrl %]
                     <div id="koha_url" class="clearfix noprint">
                         <p>Powered by
                         [% IF template.name.match('opac-main.tt') %]
@@ -33,10 +34,11 @@
                             <a class="koha_url" rel="nofollow" href="http://koha-community.org">Koha</a>
                         [% END %]</p>
                     </div>
+                    [% END %]
                 </div> <!-- /.span12 -->
             </div> <!-- /.row-fluid -->
         </div> <!-- /.container-fluid -->
-    [% END # / OpacKohaUrl %]
+    [% END # / OPACReportProblem || OpacKohaUrl %]
 
 </div> <!-- / #wrap in masthead.inc -->
 [% IF OpacLangSelectorMode == 'both' || OpacLangSelectorMode == 'footer' %]
-- 
2.39.5