Bug 16371: Fix QA issues, change terminology

Sponsored-by: Koha-Suomi Oy

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

diff --git a/Koha/Quote.pm b/Koha/Quote.pm
index f79cf79..244aea0 100644 (file)
--- a/Koha/Quote.pm
+++ b/Koha/Quote.pm
@@ -113,7 +113,7 @@ sub get_daily_quote {
 
 Is a wrapper for get_daily_quote(), with an extra check for using the correct
 interface defined in the syspref 'QuoteOfTheDay'.
-If the current interface is not allowed to display quotes, then returns undef.
+If the current interface is not allowed to display quotes, then returns nothing.
 
 =cut
 
@@ -126,7 +126,7 @@ sub get_daily_quote_for_interface {
         Koha::Exceptions::UnknownProgramState->throw(error => $cc[3]."()> C4::Context->interface() is not set! Don't know are you in OPAC or staff client?");
     }
     unless ($qotdPref =~ /$interface/) {
-        return undef;
+        return;
     }
 
     return $self->get_daily_quote(%opts);

diff --git a/Koha/Quotes.pm b/Koha/Quotes.pm
index 0fe2e16..6a9d83a 100644 (file)
--- a/Koha/Quotes.pm
+++ b/Koha/Quotes.pm
@@ -41,6 +41,10 @@ sub _type {
     return 'Quote';
 }
 
+=head3 object_class
+
+=cut
+
 sub object_class {
     return 'Koha::Quote';
 }

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
index 9fdd12b..dcf8d39 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -494,7 +494,7 @@ OPAC:
             - Show quote of the day in the
             - pref: QuoteOfTheDay
               multiple:
-                intranet: staff client
+                intranet: staff interface
                 opac: OPAC
             - main page.
         -

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
index 24d8aa4..882a446 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
@@ -38,7 +38,7 @@
                     <div id="area-news">
                         <h3>Quote of the Day</h3>
                         <div class="newsitem">
-                            <span id="daily-quote-text">[% daily_quote.text %]</span><span id="daily-quote-sep"> ~ </span><span id="daily-quote-source">[% daily_quote.source %]</span>
+                            <span id="daily-quote-text">[% daily_quote.text | html %]</span><span id="daily-quote-sep"> ~ </span><span id="daily-quote-source">[% daily_quote.source | html %]</span>
                         </div>
                     </div>
                 [% END %]