[#389 state:resolved] Updating to Config Assistant 2.1.4 which resolv…

…es an error encountered upon upgrade: _"Can't call method 'error' without a package or object reference"_. See http://github.com/endevver/mt-plugin-configassistant/commit/533a1f60e4be22fddea3eb17ad96f4daec504e23 for more details

addons/ConfigAssistant.plugin/config.yaml

@@ -4,7 +4,7 @@ key: ConfigAssistant
 author_link: http://www.majordojo.com/
 author_name: Byrne Reese
 description: This plugin provides a simple YAML based framework for creating plugin and theme configuration options.
-version: 2.1.3
+version: 2.1.4
 static_version: 4
 schema_version: 2
 

addons/ConfigAssistant.plugin/lib/ConfigAssistant/Prefs.pm

@@ -4,7 +4,9 @@ use strict;
 
 sub apply {
     my $app = shift;
+    my $q = $app->can('query') ? $app->query : $app->param;
     my ($param) = @_;
+
     $app->validate_magic or return;
 
     my $q = $app->can('query') ? $app->query : $app->param;
@@ -28,6 +30,7 @@ sub apply {
 
 sub chooser {
     my $app     = shift;
+    my $q       = $app->can('query') ? $app->query : $app->param;
     my ($param) = @_;
     my $q = $app->can('query') ? $app->query : $app->param;
     my $blog    = MT->model('blog')->load( $q->param('blog_id') );
@@ -36,7 +39,6 @@ sub chooser {
 
     my $prefs = MT->registry('blog_preferences');
     my @data;
-    my $selected = $blog->selected_config ? $blog->selected_config : '';
     foreach my $pid ( keys %$prefs ) {
         my $pref = $prefs->{$pid};
         push @data,
@@ -45,7 +47,7 @@ sub chooser {
             name        => &{ $pref->{'label'} },
             description => $pref->{'description'},
             order       => $pref->{'order'} || 10,
-            selected    => $selected eq $pid
+            selected    => $blog->selected_config eq $pid
           };
     }
     @data = sort { $a->{order} <=> $b->{order} } @data;

addons/ConfigAssistant.plugin/lib/ConfigAssistant/Static.pm

@@ -102,7 +102,7 @@ sub _traverse_hash {
             # Create the specified directory
             my $dir = File::Spec->catfile($dir, $cur_item);
             my $dir_w_plugin = File::Spec->catfile($plugin->id, $dir);
-            $message = _make_dir($dir_w_plugin);
+            $message = _make_dir($dir_w_plugin, $self);
             push @messages, $message;
             # Now investigate the next level of the registry, to see if 
             # another directory is needed, or if there are files to copy.
@@ -151,9 +151,8 @@ sub _make_dir {
         return "<nobr>Created folder: $dir</nobr>";
     }
     else {
-        $self->error($fmgr->errstr);
+        return $self ? $self->error($fmgr->errstr) : $fmgr->errstr;
     }
-    return;
 }
 
 sub _write_file {

tools/static-copy

@@ -82,7 +82,7 @@ sub _traverse_hash {
             }
             if ($process_file) {
                 my $src = File::Spec->catfile($plugin->path, 'static', $dir, $cur_item);
-                my $dest = File::Spec->catfile($app->config('StaticFilePath'), 
+                my $dest = File::Spec->catfile($app->static_file_path, 
                             'support', 'plugins', $plugin->id, $dir, $cur_item);
                 _write_file($src, $dest);
             }
@@ -97,13 +97,13 @@ sub _make_dir {
         or return MT::FileMgr->errstr;
 
     my $app = MT->instance;
-    $dir = File::Spec->catfile($app->config('StaticFilePath'), 'support', 'plugins', $dir);
+    $dir = File::Spec->catfile($app->static_file_path, 'support', 'plugins', $dir);
     if ( $fmgr->mkpath($dir) ) {
         # Success!
         my $app = MT->instance;
-        my $static_file_path = $app->config('StaticFilePath');
+        my $static_file_path = $app->static_file_path;
         $dir =~ s!$static_file_path/support/plugins/(.*)!$1!;
-        print "Created folder $dir/.\n";
+        print "Created folder $dir/\n";
     }
     else {
         die $fmgr->errstr."\n";
@@ -127,9 +127,9 @@ sub _write_file {
         # Only provide a "copied" message if the file was successfully written.
         if ($bytes) {
             my $app = MT->instance;
-            my $static_file_path = $app->config('StaticFilePath');
+            my $static_file_path = $app->static_file_path;
             $dest =~ s!$static_file_path/support/plugins/(.*)!$1!;
-            print "Copied $dest.\n";
+            print "Copied $dest\n";
         }
     }
     return;