SF.net SVN: ledger-smb:[5516] branches/1.3

[..hidden..]

Revision: 5516
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5516&view=rev
Author:   einhverfr
Date:     2013-01-08 02:23:14 +0000 (Tue, 08 Jan 2013)
Log Message:
-----------
Merging fix in from trunk: can't edit stylesheets in user preferences screen

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/LedgerSMB.pm

Property Changed:
----------------
    branches/1.3/
    branches/1.3/Changelog


Property changes on: branches/1.3
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489,5495-5496
   + /trunk:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489,5495-5496,5515

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2013-01-08 02:21:17 UTC (rev 5515)
+++ branches/1.3/Changelog	2013-01-08 02:23:14 UTC (rev 5516)
@@ -16,6 +16,7 @@
 * Fixed new Dynatable.tex not handling col ids with underscores (Chris T)
 * Fixed admin passwd reset directing to showing new user screen (Chris T)
 * Fixed admin passwd reset ineffective (Chris T, bug 3599803)
+* Fixed stylesheet cannot be set on preferences screen (Chris T, 3599804)
 
 Changelog for 1.3.27
 * Detect whether ledgersmb.conf exists during Makefile.PL run and create if


Property changes on: branches/1.3/Changelog
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/Changelog:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489,5495-5496,5513
   + /trunk/Changelog:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489,5495-5496,5513,5515

Modified: branches/1.3/LedgerSMB.pm
===================================================================
--- branches/1.3/LedgerSMB.pm	2013-01-08 02:21:17 UTC (rev 5515)
+++ branches/1.3/LedgerSMB.pm	2013-01-08 02:23:14 UTC (rev 5516)
@@ -386,7 +386,7 @@
     $self->{_locale}=LedgerSMB::Locale->get_handle($self->{_user}->{language})
      or $self->error(__FILE__.':'.__LINE__.": Locale not loaded: $!\n");
 
-    $self->{stylesheet} = $self->{_user}->{stylesheet};
+    $self->{stylesheet} = $self->{_user}->{stylesheet} unless $self->{stylesheet};
 
     $logger->debug("End");
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.