Changeset 3302867
- Timestamp:
- 05/29/2025 10:35:28 AM (10 months ago)
- Location:
- image-store/trunk
- Files:
-
- 10 edited
- 1 copied
-
. (copied) (copied from image-store/tags/3.6.0)
-
_inc/admin.php (modified) (1 diff)
-
_inc/core.php (modified) (4 diffs)
-
_inc/galleries.php (modified) (3 diffs)
-
_inc/pricing.php (modified) (3 diffs)
-
_inc/store.php (modified) (3 diffs)
-
_store/shortcode.php (modified) (1 diff)
-
admin/customers/customer-galleries.php (modified) (1 diff)
-
admin/galleries/gallery-info.php (modified) (1 diff)
-
admin/sales/sales-details.php (modified) (1 diff)
-
admin/sales/sales.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
image-store/trunk/_inc/admin.php
r3302739 r3302867 604 604 case 'expire': 605 605 if ( $post_expire = get_post_meta( $postid, '_ims_post_expire', true ) ){ 606 if ( $this->is_ims_time( $post_expire ) ) echo esc_html( date_i18n( $this->d format, strtotime($post_expire), true ) );606 if ( $this->is_ims_time( $post_expire ) ) echo esc_html( date_i18n( $this->date_format, strtotime($post_expire), true ) ); 607 607 } 608 608 break; -
image-store/trunk/_inc/core.php
r3302739 r3302867 19 19 * Make sure that new language( .mo ) files have 'ims-' as base name 20 20 */ 21 public $baseurl = ''; 22 public $dformat = ''; 23 public $content_url = ''; 24 public $content_dir = ''; 21 public $key; 22 public $loc; 23 public $sym; 24 public $units; 25 public $locale; 26 27 public $baseurl; 28 public $wp_version; 29 public $content_url; 30 public $content_dir; 31 public $date_format; 32 public $currency_format; 25 33 26 34 public $sync = false; 27 public $perma = false;28 35 public $blog_id = false; 36 public $permalinks = false; 29 37 30 38 public $color = array( ); … … 32 40 public $pages = array( ); 33 41 public $page_slugs = array( ); 42 public $rules_logic = array( ); 34 43 public $promo_types = array( ); 35 44 public $rules_property = array( ); … … 240 249 $this->sym = $this->opts['symbol']; 241 250 242 $this->d format= get_option( 'date_format' );243 $this->perma = get_option( 'permalink_structure' );244 $this->c format= array( '', "$this->sym%s", "$this->sym %s", "%s$this->sym", "%s $this->sym");251 $this->date_format = get_option( 'date_format' ); 252 $this->permalinks = get_option( 'permalink_structure' ); 253 $this->currency_format = array( '', "$this->sym%s", "$this->sym %s", "%s$this->sym", "%s $this->sym"); 245 254 246 255 $this->units = apply_filters( 'ims_units', array( … … 709 718 else $price = number_format( (double) $price, 2 ); 710 719 711 $char = ( $sym ) ? $this->c format[$this->loc] : "%s";720 $char = ( $sym ) ? $this->currency_format[$this->loc] : "%s"; 712 721 return sprintf( $before . $char, $price . $after ); 713 722 } -
image-store/trunk/_inc/galleries.php
r3302739 r3302867 17 17 * Public variables 18 18 */ 19 public $galpath = '';20 public $disabled = '';19 public $galpath; 20 public $disabled; 21 21 22 22 public $error = false; … … 25 25 public $imgnonce = false; 26 26 27 public $exts = array( ); 27 28 public $order = array( ); 28 29 public $meta = array( ); … … 32 33 public $columns = array( ); 33 34 public $metaboxes = array( ); 35 public $import_tabs = array( ); 34 36 35 37 /** -
image-store/trunk/_inc/pricing.php
r3302739 r3302867 15 15 16 16 public $tabs = array( ); 17 public $hidden = array( ); 18 public $screen = array( ); 19 public $columns = array( ); 20 public $metaboxes = array( ); 17 21 18 22 /** … … 1312 1316 $data['promo_name'] = $promo->post_title; 1313 1317 $data['startdate'] = date_i18n( 'Y-m-d', $date ); 1314 $data['starts'] = date_i18n( $this->d format, $date );1315 $data['expires'] = date_i18n( $this->d format, $expire );1318 $data['starts'] = date_i18n( $this->date_format, $date ); 1319 $data['expires'] = date_i18n( $this->date_format, $expire ); 1316 1320 $data['expiration_date'] = date_i18n( 'Y-m-d', $expire ); 1317 1321 … … 1467 1471 break; 1468 1472 case 'starts': 1469 $r .= '<td class="' . esc_attr( "column-{$column_id}{$hide}" ) .'" > ' . esc_html( date_i18n( $this->d format, strtotime( $promo->post_date ) ) ) . '</td>' ;1473 $r .= '<td class="' . esc_attr( "column-{$column_id}{$hide}" ) .'" > ' . esc_html( date_i18n( $this->date_format, strtotime( $promo->post_date ) ) ) . '</td>' ; 1470 1474 break; 1471 1475 case 'expires': 1472 1476 $r .= '<td class="' . esc_attr( "column-{$column_id}{$hide}" ) . '" > '; 1473 1477 if ( $expires = get_post_meta( $promo->ID, '_ims_post_expire', true ) ){ 1474 if ( $this->is_ims_time( $expires ) ) $r .= esc_html( date_i18n( $this->d format, $expires, true ) );1478 if ( $this->is_ims_time( $expires ) ) $r .= esc_html( date_i18n( $this->date_format, $expires, true ) ); 1475 1479 } 1476 1480 $r .= '</td>' ; -
image-store/trunk/_inc/store.php
r3302739 r3302867 15 15 * Public variables 16 16 */ 17 17 18 public $gal = false; 19 public $term = false; 18 20 public $error = false; 19 public $ term= false;21 public $order = false; 20 22 public $imgurl = false; 23 public $sortby = false; 21 24 public $is_grid = false; 22 25 public $user_id = false; … … 26 29 public $message = false; 27 30 public $is_widget = false; 31 public $is_taxonomy = false; 28 32 public $pricelist_id = false; 29 33 public $cart_status = false; 30 34 public $active_store = false; 31 35 public $favorites_ids = false; 32 public $is_taxonomy = false;33 36 public $post_logged_in = false; 34 37 public $show_comments = false; 35 38 public $is_embed_page = false; 39 public $use_trailing_slashes = false; 36 40 37 41 public $post = array( ); 38 42 public $meta = array( ); 39 43 public $sizes = array( ); 44 public $feeds = array( ); 40 45 public $subnav = array( ); 46 public $gateways = array( ); 41 47 public $user_votes = array( ); 42 48 public $attachments = array( ); … … 1365 1371 $output .= '<div class="ims-labels">'; 1366 1372 if( $this->gallery_expire > 0 && $this->imspage == 'photos' ) 1367 $output .= '<span class="ims-expires">' . esc_html__( "Expires: ", 'image-store' ) . esc_html( date_i18n( $this->d format, $this->gallery_expire ) ) . '</span>';1373 $output .= '<span class="ims-expires">' . esc_html__( "Expires: ", 'image-store' ) . esc_html( date_i18n( $this->date_format, $this->gallery_expire ) ) . '</span>'; 1368 1374 $output .= '</div><!--.ims-labels-->'; 1369 1375 -
image-store/trunk/_store/shortcode.php
r3302739 r3302867 17 17 18 18 class ImStoreShortCode { 19 20 public $opts = array(); 19 21 20 22 /** -
image-store/trunk/admin/customers/customer-galleries.php
r3302739 r3302867 96 96 '<td class="%1$s">%2$s</td>', 97 97 esc_attr( "column-{$columnid}{$hide}" ), 98 $this->is_ims_time( $post_expire ) ? esc_html( date_i18n( $this->d format, strtotime($post_expire), true ) ) : ''98 $this->is_ims_time( $post_expire ) ? esc_html( date_i18n( $this->date_format, strtotime($post_expire), true ) ) : '' 99 99 ); 100 100 break; -
image-store/trunk/admin/galleries/gallery-info.php
r3302739 r3302867 46 46 47 47 if ( $time > 0 ){ 48 $expire = date_i18n( $this->d format, $time );48 $expire = date_i18n( $this->date_format, $time ); 49 49 $ims_expire = date_i18n( 'Y-m-d H:i', $time ); 50 50 } -
image-store/trunk/admin/sales/sales-details.php
r3295969 r3302867 108 108 <td class="column-thumb" scope="row"> </td> 109 109 <td><?php esc_html_e('Date', 'image-store')?></td> 110 <td><?php echo esc_html( date_i18n( $this->d format, strtotime( $this->sale->post_date ) ) )?></td>110 <td><?php echo esc_html( date_i18n( $this->date_format, strtotime( $this->sale->post_date ) ) )?></td> 111 111 <td> </td> 112 112 <td><?php esc_html_e('Item subtotal', 'image-store')?></td> -
image-store/trunk/admin/sales/sales.php
r3302739 r3302867 154 154 break; 155 155 case 'orderdate': 156 $r .= "<td class='column-" . esc_attr( $columnid . $hide ) . "'>" . esc_html( date_i18n( $this->d format, strtotime( $sale->post_date ) ) ) . "</td>";156 $r .= "<td class='column-" . esc_attr( $columnid . $hide ) . "'>" . esc_html( date_i18n( $this->date_format, strtotime( $sale->post_date ) ) ) . "</td>"; 157 157 break; 158 158 case 'amount':
Note: See TracChangeset
for help on using the changeset viewer.