From c8e0e73000e3f7d90a7d7abf84af197728a8ba7a Mon Sep 17 00:00:00 2001
From: John Bintz <john@coswellproductions.com>
Date: Wed, 30 Sep 2009 17:38:17 -0400
Subject: [PATCH] move location of zip warning

---
 comicpress_manager_library.php | 4 ++++
 pages/comicpress_index.php     | 6 ------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/comicpress_manager_library.php b/comicpress_manager_library.php
index 5ffe1cc..2dc912d 100644
--- a/comicpress_manager_library.php
+++ b/comicpress_manager_library.php
@@ -387,6 +387,10 @@ function cpm_read_information_and_check_config() {
       $cpm_config->detailed_warnings[] = __("The current theme isn't the ComicPress theme.  If you've renamed the theme, ignore this warning.", 'comicpress-manager');
     }
 
+    if (!extension_loaded('zip')) {
+      $cpm_config->detailed_warnings[] = __("You do not have the Zip extension installed. Uploading a Zip file will not work.", 'comicpress-manager');
+    }
+
     $any_cpm_document_root_failures = false;
 
     if (!$wpmu_version) {
diff --git a/pages/comicpress_index.php b/pages/comicpress_index.php
index 9665937..80da4fd 100644
--- a/pages/comicpress_index.php
+++ b/pages/comicpress_index.php
@@ -88,12 +88,6 @@ function cpm_manager_index() {
     <?php } ?>
   </h3>
 
-    <?php if (!$zip_extension_loaded) { ?>
-      <div id="zip-upload-warning">
-        <?php printf(__('<strong>You do not have the Zip extension installed.</strong> Uploading a Zip file <strong>will not work</strong>. Either upload files individually or <a href="%s">FTP/SFTP the files to your site and import them</a>.'), "?page=" .  plugin_basename(realpath(dirname(__FILE__) . '/../comicpress_manager_admin.php') . '-import')) ?>
-      </div>
-    <?php } ?>
-
   <?php $target_url = add_query_arg("upload", "1") ?>
 
   <form onsubmit="$('submit').disabled=true" action="<?php echo $target_url ?>" method="post" enctype="multipart/form-data">