WordPress.org

Plugin Directory

Changeset 451804


Ignore:
Timestamp:
10/17/11 02:36:28 (3 years ago)
Author:
jamescollins
Message:

Revert [450054] after discussions with Gary.

Location:
wp-e-commerce/trunk
Files:
21 edited

Legend:

Unmodified
Added
Removed
  • wp-e-commerce/trunk/wp-shopping-cart.php

    r450054 r451804  
    44  * Plugin URI: http://getshopped.org/ 
    55  * Description: A plugin that provides a WordPress Shopping Cart. See also: <a href="http://getshopped.org" target="_blank">GetShopped.org</a> | <a href="http://getshopped.org/forums/" target="_blank">Support Forum</a> | <a href="http://docs.getshopped.org/" target="_blank">Documentation</a> 
    6   * Version: 3.8.8-dev 
     6  * Version: 3.8.7.1 
    77  * Author: Instinct Entertainment 
    88  * Author URI: http://getshopped.org/ 
  • wp-e-commerce/trunk/wpsc-admin/ajax-and-init.php

    r450054 r451804  
    157157        exit(); 
    158158    } else { 
    159         wp_die( __( 'Sorry, for some reason, we couldn\'t duplicate this product because it could not be found in the database, check there for this ID: ', 'wpsc' ) . $id ); 
     159        wp_die( __( 'Sorry, for some reason, we couldn\'t duplicate this product because it could not be found in the database, check there for this ID: ' ) . $id ); 
    160160    } 
    161161} 
     
    16831683 
    16841684    <tr class="form-field"> 
    1685         <th scope="row" valign="top"><label for="apply_to_current"><?php _e( 'Apply to current variations?', 'wpsc' ) ?></label></th> 
     1685        <th scope="row" valign="top"><label for="apply_to_current"><?php _e( 'Apply to current variations?' ) ?></label></th> 
    16861686        <td> 
    16871687            <span class="description"><input type="checkbox" name="apply_to_current" id="apply_to_current" style="width:2%;" <?php echo $checked; ?> /><?php _e( 'By checking this box, the price rule you implement above will be applied to all variations that currently exist.  If you leave it unchecked, it will only apply to products that use this variation created or edited from now on.  Take note, this will apply this rule to <strong>every</strong> product using this variation.  If you need to override it for any reason on a specific product, simply go to that product and change the price.', 'wpsc' ); ?></span> 
  • wp-e-commerce/trunk/wpsc-admin/display-options-settings.page.php

    r450054 r451804  
    269269 
    270270        if ( isset( $_GET['updated'] ) && (int)$_GET['updated'] ) { 
    271             printf( _n( '%s Setting options updated.', ' %s Settings options updated.', $_GET['updated'], 'wpsc' ), absint( $_GET['updated'] ) ); 
     271            printf( _n( '%s Setting options updated.', ' %s Settings options updated.', $_GET['updated'] ), absint( $_GET['updated'] ) ); 
    272272            unset( $_GET['updated'] ); 
    273273            $message = true; 
    274274        } 
    275275        if ( isset( $_GET['deleted'] ) && (int)$_GET['deleted'] ) { 
    276             printf( _n( '%s Setting option deleted.', '%s Setting option deleted.', $_GET['deleted'], 'wpsc' ), absint( $_GET['deleted'] ) ); 
     276            printf( _n( '%s Setting option deleted.', '%s Setting option deleted.', $_GET['deleted'] ), absint( $_GET['deleted'] ) ); 
    277277            unset( $_GET['deleted'] ); 
    278278            $message = true; 
    279279        } 
    280280        if ( isset( $_GET['shipadd'] ) && (int)$_GET['shipadd'] ) { 
    281             printf( _n( '%s Shipping option updated.', '%s Shipping option updated.', $_GET['shipadd'], 'wpsc' ), absint( $_GET['shipadd'] ) ); 
     281            printf( _n( '%s Shipping option updated.', '%s Shipping option updated.', $_GET['shipadd'] ), absint( $_GET['shipadd'] ) ); 
    282282            unset( $_GET['shipadd'] ); 
    283283            $message = true; 
    284284        } 
    285285        if ( isset( $_GET['added'] ) && (int)$_GET['added'] ) { 
    286             printf( _n( '%s Checkout field added.', '%s Checkout fields added.', $_GET['added'], 'wpsc' ), absint( $_GET['added'] ) ); 
     286            printf( _n( '%s Checkout field added.', '%s Checkout fields added.', $_GET['added'] ), absint( $_GET['added'] ) ); 
    287287            unset( $_GET['added'] ); 
    288288            $message = true; 
  • wp-e-commerce/trunk/wpsc-admin/display-sales-logs.php

    r450054 r451804  
    3838        <div class="wrap"> 
    3939            <h2><?php echo esc_html( __('Sales', 'wpsc') ); ?> </h2>     
    40             <p><?php printf( __( 'Your purchase logs have been updated! <a href="%s">Click here</a> to return.' , 'wpsc' ), remove_query_arg( 'subpage' ) ); ?></p> 
     40            <p><?php printf( __( 'Your purchase logs have been updated! <a href="%s">Click here</a> to return.'), remove_query_arg( 'subpage' ) ); ?></p> 
    4141        </div> 
    4242    <?php 
     
    329329      <input type="submit" value="<?php _e('Apply', 'wpsc'); ?>" name="doaction" id="doaction" class="button-secondary action" /> 
    330330      <?php /* View functions for purchlogs */?> 
    331       <label for='view_purchlogs_by'><?php _e( 'View:', 'wpsc' ); ?></label> 
     331      <label for='view_purchlogs_by'><?php _e('View:'); ?></label> 
    332332 
    333333      <select id='view_purchlogs_by' name='view_purchlogs_by'> 
  • wp-e-commerce/trunk/wpsc-admin/display-update.page.php

    r450054 r451804  
    5555function wpsc_display_php_version_notice() { 
    5656?> 
    57     <div id='wpsc-warning' class='error fade'><p><?php printf( __( 'You are using PHP %s. WP e-Commerce %s requires PHP 5.0 or above. Please contact your hosting provider for further assistance.', 'wpsc' ), PHP_VERSION, WPSC_VERSION ); ?></p></div> 
     57    <div id='wpsc-warning' class='error fade'><p><?php printf( __( "You are using PHP %s. WP e-Commerce %s requires PHP 5.0 or above. Please contact your hosting provider for further assistance." ), PHP_VERSION, WPSC_VERSION ); ?></p></div> 
    5858<?php 
    5959} 
  • wp-e-commerce/trunk/wpsc-admin/includes/save-data.functions.php

    r450054 r451804  
    217217<!-- START OF TARGET MARKET SELECTION --> 
    218218<div id="poststuff" class="postbox"> 
    219     <h3 class="hndle"><?php _e( 'Target Market Restrictions', 'wpsc' ); ?></h3> 
     219    <h3 class="hndle"><?php _e('Target Market Restrictions'); ?></h3> 
    220220    <div class="inside"><?php 
    221221        $category_id = ''; 
  • wp-e-commerce/trunk/wpsc-admin/includes/settings-pages/admin.php

    r450054 r451804  
    6666 
    6767                        <span class="wpscsmall description"> 
    68                             <?php _e('Warning: Disabling this exposes your site to greater possibility of malicious files being uploaded, we recommend installing the Fileinfo extention for PHP rather than disabling this.', 'wpsc'); ?> 
     68                            <?php _e('Warning: Disabling this exposes your site to greater possibility of malicious files being uploaded, we reccomend installing the Fileinfo extention for PHP rather than disabling this.', 'wpsc'); ?> 
    6969                        </span> 
    7070                    </td> 
  • wp-e-commerce/trunk/wpsc-admin/includes/settings-pages/presentation.php

    r450054 r451804  
    717717                            <input type='hidden' name='wpsc_options[embed_live_search_results]' value='0' /> 
    718718                            <input type='checkbox' name='wpsc_options[embed_live_search_results]' id='embed_live_search_results'<?php echo $embed_live_search_results; ?> value='1' /> 
    719                             <?php _e( 'Dynamically replace search results into product list', 'wpsc' ); ?> 
     719                            <?php _e( 'Dynamically replace search results into product list' ); ?> 
    720720                        </div> 
    721721                    </td> 
  • wp-e-commerce/trunk/wpsc-admin/includes/updating-functions.php

    r450054 r451804  
    123123            echo __( 'Under a minute', 'wpsc' ); 
    124124        else 
    125             printf( _n( '%d minute', '%d minutes', $this->eta, 'wpsc' ), $this->eta ); 
     125            printf( _n( '%d minute', '%d minutes', $this->eta ), $this->eta ); 
    126126        echo '</div>'; 
    127127    } 
     
    187187            echo __( 'Under a minute', 'wpsc' ); 
    188188        else 
    189             printf( _n( '%d minute', '%d minutes', $eta, 'wpsc' ), $eta ); 
     189            printf( _n( '%d minute', '%d minutes', $eta ), $eta ); 
    190190        echo '</div>'; 
    191191        $milestone = $now; 
  • wp-e-commerce/trunk/wpsc-core/js/tinymce3/window.php

    r450054 r451804  
    77//Check capabilities 
    88if ( !current_user_can('edit_pages') && !current_user_can('edit_posts') )  
    9     wp_die( __( 'You don\'t have permission to be doing that!', 'wpsc' ) ); 
     9    wp_die(__("You don't have permission to be doing that!")); 
    1010 
    1111global $wpdb;  
  • wp-e-commerce/trunk/wpsc-core/wpsc-constants.php

    r450054 r451804  
    2727        define( 'WPSC_URL',       plugins_url( '', __FILE__ ) ); 
    2828    // Define Plugin version 
    29     define( 'WPSC_VERSION', '3.8.8-dev' ); 
    30     define( 'WPSC_MINOR_VERSION', '449104' ); 
    31     define( 'WPSC_PRESENTABLE_VERSION', '3.8.8-dev' ); 
     29    define( 'WPSC_VERSION', '3.8.7.1' ); 
     30    define( 'WPSC_MINOR_VERSION', '449097' ); 
     31    define( 'WPSC_PRESENTABLE_VERSION', '3.8.7.1' ); 
    3232 
    3333    // Define Debug Variables for developers 
  • wp-e-commerce/trunk/wpsc-core/wpsc-includes.php

    r450054 r451804  
    5959    include_once( WPSC_FILE_PATH . '/wpsc-admin/admin.php' ); 
    6060 
    61 require_once( WPSC_FILE_PATH . '/wpsc-includes/cron.php' ); 
     61if ( defined( 'DOING_CRON' ) ) 
     62    require_once( WPSC_FILE_PATH . '/wpsc-includes/cron.php' ); 
    6263 
    6364?> 
  • wp-e-commerce/trunk/wpsc-core/wpsc-installer.php

    r450054 r451804  
    3535    $table_name    = $wpdb->prefix . "wpsc_product_list"; 
    3636    $first_install = false; 
    37  
    38     if( $wpdb->get_var("SHOW TABLES LIKE '$table_name'") !== $table_name ) { 
    39         // Table doesn't exist 
     37    $result        = mysql_list_tables( DB_NAME ); 
     38    $tables        = array(); 
     39 
     40    while ( $row = mysql_fetch_row( $result ) ) 
     41        $tables[] = $row[0]; 
     42 
     43    if ( !in_array( $table_name, $tables ) ) { 
    4044        $first_install = true; 
    4145        add_option( 'wpsc_purchaselogs_fixed', true ); 
  • wp-e-commerce/trunk/wpsc-includes/cron.php

    r450054 r451804  
    22    add_action( 'wpsc_hourly_cron_task', 'wpsc_clear_stock_claims' ); 
    33    /** 
    4      * wpsc_clear_stock_claims, clears the stock claims, runs using wp-cron and when editing purchase log statuses via the dashboard 
     4     * wpsc_clear_stock_claims, clears the stock claims, runs using wp-cron 
    55     */ 
    66    function wpsc_clear_stock_claims() { 
  • wp-e-commerce/trunk/wpsc-languages/EN_en.php

    r450054 r451804  
    2222 
    2323define('TXT_WPSC_DROPSHOP_CRAFTYC','Crafty'); 
    24 define('TXT_WPSC_CHECK_MIME_TYPES_WARNING', 'Warning: Disabling this exposes your site to greater possibility of malicious files being uploaded, we recommend installing the Fileinfo extention for PHP rather than disabling this.'); 
     24define('TXT_WPSC_CHECK_MIME_TYPES_WARNING', 'Warning: Disabling this exposes your site to greater possibility of malicious files being uploaded, we reccomend installing the Fileinfo extention for PHP rather than disabling this.'); 
    2525define('TXT_WPSC_CHECK_MIME_TYPES', 'Check MIME types on file uploads'); 
    2626define('TXT_WPSC_SHIPPING_SAME_AS_BILLING', 'Enable Shipping Same as Billing Option: '); 
  • wp-e-commerce/trunk/wpsc-merchants/paypal-express.merchant.php

    r450054 r451804  
    115115        $received_values = array(); 
    116116        $received_values['cmd'] = '_notify-validate'; 
    117         $received_values += stripslashes_deep ( $_POST ); 
     117        $received_values += $_POST; 
    118118        $options = array( 
    119119            'timeout' => 5, 
     
    514514        } 
    515515        if($current_currency != $store_currency_code) { 
    516             $output .= "<tr> <td colspan='2'><strong class='form_group'>" . __( 'Currency Converter', 'wpsc' ) . "</td> </tr> 
     516            $output .= "<tr> <td colspan='2'><strong class='form_group'>".__('Currency Converter')."</td> </tr> 
    517517            <tr> 
    518518                <td colspan='2'>".__('Your website is using a currency not accepted by PayPal, select an accepted currency using the drop down menu bellow. Buyers on your site will still pay in your local currency however we will convert the currency and send the order through to PayPal using the currency you choose below.', 'wpsc')."</td> 
  • wp-e-commerce/trunk/wpsc-merchants/paypal-pro.merchant.php

    r450054 r451804  
    245245        $received_values = array( ); 
    246246        $received_values['cmd'] = '_notify-validate'; 
    247         $received_values += stripslashes_deep ( $_POST ); 
     247        $received_values += $_POST; 
    248248 
    249249        $options = array( 
     
    444444    } 
    445445    if($current_currency != $store_currency_code) { 
    446         $output .= "<tr> <td colspan='2'><strong class='form_group'>" . __( 'Currency Converter', 'wpsc' ) . "</td> </tr> 
     446        $output .= "<tr> <td colspan='2'><strong class='form_group'>".__('Currency Converter')."</td> </tr> 
    447447        <tr> 
    448448            <td colspan='2'>".__('Your website is using a currency not accepted by PayPal, select an accepted currency using the drop down menu bellow. Buyers on your site will still pay in your local currency however we will convert the currency and send the order through to PayPal using the currency you choose below.', 'wpsc')."</td> 
  • wp-e-commerce/trunk/wpsc-merchants/paypal-standard.merchant.php

    r450054 r451804  
    340340        $received_values = array(); 
    341341        $received_values['cmd'] = '_notify-validate'; 
    342         $received_values += stripslashes_deep ($_POST); 
     342        $received_values += $_POST; 
    343343        $options = array( 
    344344            'timeout' => 5, 
     
    632632        $output .= " 
    633633  <tr> 
    634       <td colspan='2'><strong class='form_group'>" . __( 'Currency Converter', 'wpsc' ) . "</td> 
     634      <td colspan='2'><strong class='form_group'>".__('Currency Converter')."</td> 
    635635  </tr> 
    636636  <tr> 
  • wp-e-commerce/trunk/wpsc-shipping/ups_20.php

    r450054 r451804  
    249249                            <td> 
    250250                                <input type=\"checkbox\" id=\"ups_singular_shipping\" name=\"wpsc_ups_settings[singular_shipping]\" value=\"1\" ".$singular_shipping." /><br /> 
    251                                 " . __( 'Rate each quantity of items in a cart as its own package using dimensions on product', 'wpsc' ) . " 
     251                                ".__('Rate each quantity of items in a cart as its own package using dimensions on product')." 
    252252                            </td> 
    253253                        </tr> 
  • wp-e-commerce/trunk/wpsc-theme/wpsc-shopping_cart_page.php

    r450054 r451804  
    3232      <?php  //this displays the confirm your order html ?> 
    3333 
    34       <?php do_action ( "wpsc_before_checkout_cart_row" ); ?> 
    3534      <tr class="product_row product_row_<?php echo wpsc_the_cart_item_key(); ?> <?php echo $alt_class;?>"> 
    3635 
    3736         <td class="firstcol wpsc_product_image wpsc_product_image_<?php echo wpsc_the_cart_item_key(); ?>"> 
    3837         <?php if('' != wpsc_cart_item_image()): ?> 
    39             <?php do_action ( "wpsc_before_checkout_cart_item_image" ); ?> 
    4038            <img src="<?php echo wpsc_cart_item_image(); ?>" alt="<?php echo wpsc_cart_item_name(); ?>" title="<?php echo wpsc_cart_item_name(); ?>" class="product_image" /> 
    41             <?php do_action ( "wpsc_after_checkout_cart_item_image" ); ?> 
    4239         <?php else: 
    4340         /* I dont think this gets used anymore,, but left in for backwards compatibility */ 
     
    5350 
    5451         <td class="wpsc_product_name wpsc_product_name_<?php echo wpsc_the_cart_item_key(); ?>"> 
    55             <?php do_action ( "wpsc_before_checkout_cart_item_name" ); ?> 
    5652            <a href="<?php echo wpsc_cart_item_url();?>"><?php echo wpsc_cart_item_name(); ?></a> 
    57             <?php do_action ( "wpsc_after_checkout_cart_item_name" ); ?> 
    5853         </td> 
    5954 
     
    8075         </td> 
    8176      </tr> 
    82       <?php do_action ( "wpsc_after_checkout_cart_row" ); ?> 
    8377   <?php endwhile; ?> 
    8478   <?php //this HTML displays coupons if there are any active coupons to use ?> 
  • wp-e-commerce/trunk/wpsc-theme/wpsc-single_product.php

    r450054 r451804  
    6464                        <div class="custom_meta"> 
    6565                            <?php while ( wpsc_have_custom_meta() ) : wpsc_the_custom_meta(); ?> 
    66                                 <?php if (stripos(wpsc_custom_meta_name(),'g:') !== FALSE) continue; ?> 
    6766                                <strong><?php echo wpsc_custom_meta_name(); ?>: </strong><?php echo wpsc_custom_meta_value(); ?><br /> 
    6867                            <?php endwhile; ?> 
Note: See TracChangeset for help on using the changeset viewer.