Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 10052: Db revision for intranetstylesheet

Browse source 
Report 10052 makes the intranetstylesheet prefs behave like the opac ones.
This patch contains an optional db revision: If the pref intranetstylesheet is
not blank, and does not start with http, https or /, then prefix it with a
slash to make it an absolute path.

Test plan:
Before applying this patch:
1) Put intranet-tmpl/prog/en/css/staff-global.css into intranetstylesheet.
This works in the current staff client, but will be interpreted as relative as
soon as both patches for this report have been applied.
Apply the patch. And run: /cgi-bin/koha/installer/install.pl?step=3&op=updatestructure
Check the webinstaller warning and the pref value. There should be a slash
in front now. The css should still work.

Continue after applying this patch with:
2) Clear the intranetstylesheet pref. Run updatestructure again. No message: OK
3) Put /intranet-tmpl/prog/en/css/staff-global.css in intranetstylesheet.
Run updatestructure again. No message: OK
4) Prefix intranetstylesheet with http://[your-server-here]. Test again.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Comments on last patch.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
This commit is contained in:
Marcel de Rooy 2013-04-15 12:06:31 +02:00 committed by Galen Charlton
parent 3a29a06955
commit 81937d1d79
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
installer/data/mysql/updatedatabase.pl
View file

@ -6957,6 +6957,24 @@ if(CheckVersion($DBversion)) {
SetVersion($DBversion);
}
$DBversion = "3.11.00.XXX";
if(CheckVersion($DBversion)) {
my $intra= C4::Context->preference("intranetstylesheet");
#if this pref is not blank or starting with http, https or / [root], then
#add an additional / to the front
if($intra && $intra!~/^(\/|https?)/) {
$dbh->do("UPDATE systempreferences SET value=? WHERE variable=?",
undef,('/'.$intra,"intranetstylesheet"));
print "WARNING: Your system preference intranetstylesheet has been prefixed with a slash to make it an absolute path.\n";
}
print "Upgrade to $DBversion done (Bug 10052: Make intranetstylesheet and intranetcolorstylesheet behave exactly like their opac counterparts)\n";
SetVersion ($DBversion);
}
=head1 FUNCTIONS
=head2 TableExists($table)