18.47 [patch #737 - user settings not loaded in File Manager]

Author: Ilia Rostovtsev

CHANGELOG.md

@@ -1,5 +1,8 @@
 ## Changelog
 
+#### Version 18.47-patch1 (April 30, 2017)
+* Fixed bug [#737](https://github.com/qooob/authentic-theme/issues/737)
+
 #### Version 18.47 (April 29, 2017)
 * Added desktop notifications [#734](https://github.com/qooob/authentic-theme/issues/734)
 * Added improved display and data-grouping for theme's update notice

authentic-init.pm

@@ -9,12 +9,12 @@ init_funcs();
 
 sub settings
 {
-    my ($f) = @_;
+    my ( $f, $e ) = @_;
     my %c;
     if ( -r $f ) {
         my $k = read_file_contents($f);
         my %k = $k =~ /(.*?)=(.*)/g;
-        delete @k{ grep( !/^settings_/, keys %k ) };
+        delete @k{ grep( !/^$e/, keys %k ) };
         foreach $s ( keys %k ) {
             $k{$s} =~ s/^[^']*\K'|'(?=[^']*$)|;(?=[^;]*$)//g;
             $k{$s} =~ s/\\'/'/g;
@@ -561,8 +561,8 @@ sub init_vars
 
     our $t_uri__i = get_env('request_uri');
     our %__settings = ( settings_default(),
-                        settings( $config_directory . "/authentic-theme/settings.js" ),
-                        settings( get_user_home() . "/.atconfig" ) );
+                        settings( $config_directory . "/authentic-theme/settings.js", 'settings_' ),
+                        settings( get_user_home() . "/.atconfig",                     'settings_' ) );
     our ( %text, %in, %gconfig, $current_theme, $root_directory, $theme_root_directory, $t_var_switch_m,
           $t_var_product_m );
 
@@ -1099,8 +1099,8 @@ sub theme_version
     (     ( !$switch && $sh__ln__g___version )
        && ( $sh__ln__c___version = $sh__ln__g___version, ( $sh__ln__c___version =~ s/\.|-|git//ig ) ) );
 
-    if (theme_mode() eq 'debug' && !$switch && $sh__ln__g___version) {
-      $sh__ln__c___version .= time();
+    if ( theme_mode() eq 'debug' && !$switch && $sh__ln__g___version ) {
+        $sh__ln__c___version .= time();
     }
     return $sh__ln__c___version;
 }

authentic-lib.pm

@@ -3628,9 +3628,7 @@ sub manage_theme_config
     elsif ( $action eq 'load' ) {
         my $atconfig_file = ( get_user_home() . "/.atconfig" );
         if ( -f $atconfig_file ) {
-            my %atconfig = ( settings( get_user_home() . "/.atconfig" ) );
-
-            delete @atconfig{ grep( !/^config_portable_/, keys %atconfig ) };
+            my %atconfig = ( settings( $atconfig_file, 'config_portable_' ) );
             get_json( \%atconfig );
         }
         else {

version

@@ -0,0 +1 @@
+18.47-git-201704301121