Changeset 723 for trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include

Timestamp:

Apr 29, 2011, 2:20:54 PM (14 years ago)

Author:

toemon

Message:

パッケージの構成で、展開フォルダー直下にxpressme_integration_kitフォルダーがある場合の対応
及び対が言語ファイル

File:

• trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/class-xpress-upgrader.php (modified) (3 diffs)

trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/class-xpress-upgrader.php

@@ -12 +12 @@
                 $this->strings['make_config'] = __('Delete source wp-config.php.', 'xpressme');
                 $this->strings['delete_failed'] = __('Could not delete files.', 'xpressme');
+                $this->strings['package_wrong'] = __('The structure of the package is wrong. ', 'xpressme');
         }
 
@@ -40 +41 @@
                 if ( is_wp_error($working_dir) )
                         return $working_dir;
-                $subdirs = $wp_filesystem->dirlist($working_dir,false);
-                foreach($subdirs as $subdir){
-                        $subdir_name = $subdir['name'];
+                $kit_dir = $working_dir .'/xpressme_integration_kit/';
+                if (!file_exists($kit_dir)){    // search sub dir.
+                        $kit_dir = '';
+                        $subdirs = $wp_filesystem->dirlist($working_dir,false);
+                        foreach($subdirs as $subdir){
+                                if (file_exists($working_dir .'/' .$subdir['name'] .'/xpressme_integration_kit/')){
+                                        $kit_dir = $working_dir .'/' .$subdir['name'] .'/xpressme_integration_kit/';
+                                        continue;
+                                }
+                        }
+                        if (empty($kit_dir)){
+                                $wp_filesystem->delete($working_dir, true);
+                                return new WP_Error('package_wrong', $this->strings['package_wrong']);
+                        }
                 }
-                
-                $kit_dir = $working_dir .'/' .$subdir_name .'/xpressme_integration_kit/';
-                
                 // Copy update-core.php from the new version into place.
                 $update_xpress_file = 'wp-content/plugins/xpressme/include/update_xpress.php';
@@ -59 +68 @@
         }
 }
-
+?>