View | Details | Raw Unified | Return to bug 10986
Collapse All | Expand All

(-)a/C4/Languages.pm (-1 / +1 lines)
Lines 203-209 sub getLanguages { Link Here
203 
    my $dbh=C4::Context->dbh;
 203 
    my $dbh=C4::Context->dbh;
204 
    my $default_language = 'en';
 204 
    my $default_language = 'en';
205 
    my $current_language = $default_language;
 205 
    my $current_language = $default_language;
206 
    my $language_list=C4::Context->preference("AdvancedSearchLanguages") if $isFiltered;
 206 
    my $language_list = $isFiltered ? C4::Context->preference("AdvancedSearchLanguages") : undef;
207 
    if ($lang) {
 207 
    if ($lang) {
208 
        $current_language = regex_lang_subtags($lang)->{'language'};
 208 
        $current_language = regex_lang_subtags($lang)->{'language'};
209 
    }
 209 
    }
(-)a/installer/data/mysql/sysprefs.sql (-2 / +2 lines)
Lines 5-10 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
5 
('AcqWarnOnDuplicateInvoice','0','','Warn librarians when they try to create a duplicate invoice','YesNo'),
 5 
('AcqWarnOnDuplicateInvoice','0','','Warn librarians when they try to create a duplicate invoice','YesNo'),
6 
('AddPatronLists','categorycode','categorycode|category_type','Allow user to choose what list to pick up from when adding patrons','Choice'),
 6 
('AddPatronLists','categorycode','categorycode|category_type','Allow user to choose what list to pick up from when adding patrons','Choice'),
7 
('advancedMARCeditor','0','','If ON, the MARC editor won\'t display field/subfield descriptions','YesNo'),
 7 
('advancedMARCeditor','0','','If ON, the MARC editor won\'t display field/subfield descriptions','YesNo'),
8 
('AdvancedSearchLanguages','','','ISO 639-2 codes of languages you wish to see appear as an Advanced search option.  Example: eng|fre|ita','Textarea'),
8 
('AdvancedSearchTypes','itemtypes','itemtypes|ccode','Select which set of fields comprise the Type limit in the advanced search','Choice'),
 9 
('AdvancedSearchTypes','itemtypes','itemtypes|ccode','Select which set of fields comprise the Type limit in the advanced search','Choice'),
9 
('AgeRestrictionMarker','',NULL,'Markers for age restriction indication, e.g. FSK|PEGI|Age|','free'),
 10 
('AgeRestrictionMarker','',NULL,'Markers for age restriction indication, e.g. FSK|PEGI|Age|','free'),
10 
('AgeRestrictionOverride','0',NULL,'Allow staff to check out an item with age restriction.','YesNo'),
 11 
('AgeRestrictionOverride','0',NULL,'Allow staff to check out an item with age restriction.','YesNo'),
Lines 422-427 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
422 
('XSLTResultsDisplay','default','','Enable XSL stylesheet control over results page display on intranet','Free'),
 423 
('XSLTResultsDisplay','default','','Enable XSL stylesheet control over results page display on intranet','Free'),
423 
('yuipath','local','local|http://yui.yahooapis.com/2.5.1/build','Insert the path to YUI libraries, choose local if you use koha offline','Choice'),
 424 
('yuipath','local','local|http://yui.yahooapis.com/2.5.1/build','Insert the path to YUI libraries, choose local if you use koha offline','Choice'),
424 
('z3950AuthorAuthFields','701,702,700',NULL,'Define the MARC biblio fields for Personal Name Authorities to fill biblio.author','free'),
 425 
('z3950AuthorAuthFields','701,702,700',NULL,'Define the MARC biblio fields for Personal Name Authorities to fill biblio.author','free'),
425 
('z3950NormalizeAuthor','0','','If ON, Personal Name Authorities will replace authors in biblio.author','YesNo'),
 426 
('z3950NormalizeAuthor','0','','If ON, Personal Name Authorities will replace authors in biblio.author','YesNo')
426 
('AdvancedSearchLanguages','','','ISO 639-2 codes of languages you wish to see appear as an Advanced search option.  Example: eng|fre|ita','Textarea')
427 
;
 427 
;
(-)a/installer/data/mysql/updatedatabase.pl (-3 / +1 lines)
Lines 7154-7160 if ( CheckVersion($DBversion) ) { Link Here
7154 
    SetVersion($DBversion);
 7154 
    SetVersion($DBversion);
7155 
}
 7155 
}
7156 

          7156
          

        

            

              7157
              
<<<<<<< HEAD

              
              
            

        

          7158
          
$DBversion = "3.13.00.023";

          7157
          
$DBversion = "3.13.00.023";

        

        

          7159
          
if ( CheckVersion($DBversion) ) {

          7158
          
if ( CheckVersion($DBversion) ) {

        

        

          7160
          
    $dbh->do("ALTER TABLE borrowers CHANGE password password VARCHAR(60);");

          7159
          
    $dbh->do("ALTER TABLE borrowers CHANGE password password VARCHAR(60);");

        

  

    
      
            Lines 7740-7746
          if(CheckVersion($DBversion)) {
      
      
        Link Here
      
    
  

        

          7740
          
    $dbh->do(q{

          7739
          
    $dbh->do(q{

        

        

          7741
          
        INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('AcqItemSetSubfieldsWhenReceived','','Set subfields for item when items are created when receiving (e.g. o=5|a="foo bar")','','Free');

          7740
          
        INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('AcqItemSetSubfieldsWhenReceived','','Set subfields for item when items are created when receiving (e.g. o=5|a="foo bar")','','Free');

        

        

          7742
          
    });

          7741
          
    });

        

          
            

              7743
              
    print "Upgrade to $DBversion done (Added AcqItemSetSubfieldsWhenReceived syspref)\n";


              7742
              
    print "Upgrade to $DBversion done (Bug 10986: Added AcqItemSetSubfieldsWhenReceived syspref)\n";

            

        

          7744
          
    SetVersion($DBversion);

          7743
          
    SetVersion($DBversion);

        

        

          7745
          
}

          7744
          
}

        

        

          7746
          

          7745
          

        

            

              7747
              
- 

              
              
            






  

  Return to bug 10986