X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FLayout%2FTop.pm;h=471d6128dc01303baa7869a890a32336a954f180;hb=3782a90c336bc6c506f572e607c8526cb5e79ea3;hp=2ae61cb05db457d49175e5fa6e519739a9510009;hpb=6c63020409f486043d63c3a324db96a4a162ff67;p=kivitendo-erp.git

diff --git a/SL/Layout/Top.pm b/SL/Layout/Top.pm
index 2ae61cb05..471d6128d 100644
--- a/SL/Layout/Top.pm
+++ b/SL/Layout/Top.pm
@@ -8,19 +8,25 @@ use SL::Controller::TopQuickSearch;
 sub pre_content {
   my ($self) = @_;
 
+  my @options;
+  # Only enable the quick search functionality if all database
+  # upgrades have already been applied as quick search requires
+  # certain columns that are only created by said database upgrades.
+  push @options, (quick_search => SL::Controller::TopQuickSearch->new) unless $::request->applying_database_upgrades;
+
   $self->presenter->render('menu/header',
     now        => DateTime->now_local,
     is_fastcgi => $::dispatcher ? scalar($::dispatcher->interface_type =~ /fastcgi/i) : 0,
     is_links   => scalar($ENV{HTTP_USER_AGENT}         =~ /links/i),
-    quick_search => SL::Controller::TopQuickSearch->new,
+    @options,
   );
 }
 
-sub stylesheets {
+sub static_stylesheets {
  'frame_header/header.css';
 }
 
-sub javascripts {
+sub static_javascripts {
   'jquery-ui.js',
   'kivi.QuickSearch.js',
 }