diff --git a/apps.installer.inc b/apps.installer.inc index bfe7859..8bb2ced 100755 --- a/apps.installer.inc +++ b/apps.installer.inc @@ -118,7 +118,6 @@ function apps_download_batch($project, $url, $type, &$context) { // Verify it. $archive_errors = update_manager_archive_verify($project, $local_cache, $extract_directory); - $archive_errors = array(); if (!empty($archive_errors)) { // We just need to make sure our array keys don't collide, so use the // numeric keys from the $archive_errors array. diff --git a/apps.profile.inc b/apps.profile.inc index d1b1945..6f630f8 100755 --- a/apps.profile.inc +++ b/apps.profile.inc @@ -13,7 +13,7 @@ function apps_profile_install_tasks($install_state, $apps_server) { // Only use apps forms during interactive installs. $tasks = array(); - if ($install_state['interactive']) { + if ($install_state['interactive'] || is_writable(drupal_realpath('sites/all/modules'))) { $apps_server_name = $apps_server['machine name']; $_SESSION['apps_servers'][$apps_server_name] = $apps_server; $tasks = array( @@ -141,7 +141,10 @@ function apps_profile_apps_select_form($form, $form_state, &$install_state) { */ function apps_profile_apps_select_form_submit($form, &$form_state) { $_SESSION['apps'] = array(); - if ($form_state['values']['op'] == t('Install Apps')) { + // Checking to make sure that skip was not clicked. We compare the op + // against the form_state for click to handle both the interactive case + // where op is set and the non-interactive case where there is no op. + if ($form_state['values']['op'] != $form_state['values']['skip']) { $_SESSION['apps'] = array_filter($form_state['values']['apps']); $_SESSION['apps_default_content'] = $form_state['values']['default_content']; } @@ -157,7 +160,7 @@ function apps_profile_download_app_modules(&$install_state) { $apps[] = $_SESSION['apps_manifest'][$name]; } $batch = apps_download_apps_batch($apps); - + $batch['finished'] = 'apps_profile_download_batch_finished'; return $batch; } @@ -404,4 +407,4 @@ function apps_profile_get_server_name($server) { ? $t('Install @name Apps', array('@name' => $server['title'])) : $t('Install Apps'); -} \ No newline at end of file +}