Skip to content
Browse files

Fix dummy data and import process. Closes #639.

  • Loading branch information...
1 parent 1454a7a commit 6fac70966dcd0ba1a20b819aa9c7a4562ff24246 @mikejolley mikejolley committed Feb 15, 2012
Showing with 1,357 additions and 1,369 deletions.
  1. +1 −14 admin/woocommerce-admin-import.php
  2. +1 −1 admin/woocommerce-admin-init.php
  3. +1,354 −1,354 dummy_data.xml
  4. +1 −0 readme.txt
View
15 admin/woocommerce-admin-import.php
@@ -11,7 +11,6 @@
*/
function woocommerce_import_start() {
-
global $wpdb;
$id = (int) $_POST['import_id'];
@@ -54,21 +53,9 @@ function woocommerce_import_start() {
array('product'),
array(
'hierarchical' => true,
- 'labels' => array(
- 'name' => $nicename,
- 'singular_name' => $nicename,
- 'search_items' => __( 'Search', 'woocommerce') . ' ' . $nicename,
- 'all_items' => __( 'All', 'woocommerce') . ' ' . $nicename,
- 'parent_item' => __( 'Parent', 'woocommerce') . ' ' . $nicename,
- 'parent_item_colon' => __( 'Parent', 'woocommerce') . ' ' . $nicename . ':',
- 'edit_item' => __( 'Edit', 'woocommerce') . ' ' . $nicename,
- 'update_item' => __( 'Update', 'woocommerce') . ' ' . $nicename,
- 'add_new_item' => __( 'Add New', 'woocommerce') . ' ' . $nicename,
- 'new_item_name' => __( 'New', 'woocommerce') . ' ' . $nicename
- ),
'show_ui' => false,
'query_var' => true,
- 'rewrite' => array( 'slug' => strtolower(sanitize_title($nicename)), 'with_front' => false, 'hierarchical' => true ),
+ 'rewrite' => false,
)
);
View
2 admin/woocommerce-admin-init.php
@@ -69,7 +69,7 @@ function woocommerce_admin_init() {
if ( $pagenow=='index.php' ) :
include_once( 'woocommerce-admin-dashboard.php' );
- elseif ( $pagenow=='import.php' ) :
+ elseif ( $pagenow=='admin.php' && isset($_GET['import']) ) :
include_once( 'woocommerce-admin-import.php' );
elseif ( $pagenow=='post-new.php' || $pagenow=='post.php' || $pagenow=='edit.php' ) :
include_once( 'post-types/post-types-init.php' );
View
2,708 dummy_data.xml
1,354 additions, 1,354 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
1 readme.txt
@@ -103,6 +103,7 @@ Yes you can! Join in on our GitHub repository :) https://github.com/woothemes/wo
* Password error on checkout
* Improved install process
* Hookable woocommerce_form_field
+* Updated dummy content
= 1.4.2 - 09/02/2012 =
* Uninstall fix

0 comments on commit 6fac709

Please sign in to comment.
Something went wrong with that request. Please try again.