Changeset 2171825

Timestamp:

10/11/2019 02:57:01 PM (5 years ago)

Author:

sjregan

Message:

fix: old shortcode and plugins no longer work

Location:

instashop/trunk

Files:

• includes/class-instashop-widget.php (added)
• includes/class-socialshop-admin-api.php (modified) (1 diff)
• includes/class-socialshop-widget.php (modified) (1 diff)
• includes/class-socialshop.php (modified) (12 diffs)
• readme.txt (modified) (1 diff)
• socialshop.php (modified) (3 diffs)

instashop/trunk/includes/class-socialshop-admin-api.php

@@ -24 +24 @@
      */
     public function embed_screen () {
+
+
     ?>
 
-        <iframe src="<?php echo apply_filters( 'socialshop_embed_url', self::EMBED_URL ); ?>" style="width: 100%; height: 100px; background-color: transparent;" id="socialshop-embed"></iframe>
+        <iframe src="<?php echo ; ?>" style="width: 100%; height: 100px; background-color: transparent;" id="socialshop-embed"></iframe>
         <script type="text/javascript">
             jQuery(function ($) {

instashop/trunk/includes/class-socialshop-widget.php

@@ -10 +10 @@
     public function __construct () {
         parent::__construct( 'socialshop-gallery', __('SocialShop Gallery', 'socialshop' ), array(
-            'description' => __( 'Display an SocialShop gallery.', 'socialshop' )
+            'description' => __( 'Display a SocialShop gallery.', 'socialshop' )
         ) );
     }

instashop/trunk/includes/class-socialshop.php

@@ -112 +112 @@
 
         // Add our shortcode
+
         add_shortcode( 'socialshop', array( $this, 'gallery_shortcode' ) );
 
@@ -245 +246 @@
             }
 
-            $product_source_language = apply_filters( 'socialshop_gallery_product_source_lang', null, $attr['gallery'], $data['product-id'] );
+            $product_source_language = apply_filters( 'instashop_gallery_product_source_lang', null, $attr['gallery'], $data['product-id'] );
+            $product_source_language = apply_filters( 'socialshop_gallery_product_source_lang', $product_source_language, $attr['gallery'], $data['product-id'] );
 
             if ( $attr['product-source-lang'] ) {
@@ -256 +258 @@
         }
 
-        $source = apply_filters( 'socialshop_gallery_source', '' );
-        
+        $source = apply_filters( 'instashop_gallery_source', '' );
+        $source = apply_filters( 'socialshop_gallery_source', $source );
+
         if ( $source ) {
             $data['source'] = $source;
@@ -271 +274 @@
         wp_enqueue_script( $this->_token . '-gallery' );
 
-        $output = sprintf('<div class="instashop-gallery%s" %s></div>', $attr['class'] ? ' ' .$attr['class'] : '', $data_string );
+        $output = sprintf('<div class="socialshop-gallery instashop-gallery%s" %s></div>', $attr['class'] ? ' ' .$attr['class'] : '', $data_string );
+        $output = apply_filters( 'instashop_gallery_shortcode', $output, $attr );
         $output = apply_filters( 'socialshop_gallery_shortcode', $output, $attr );
 
@@ -281 +285 @@
      */
     public function register_widget () {
+
         register_widget( 'SocialShopGalleryWidget' );
     }
@@ -299 +304 @@
         $gallery_id = $this->settings->get( 'product_gallery_id' );
         $product_id = get_the_ID();
-        $template = apply_filters( 'socialshop_gallery_template', $this->settings->get( 'product_gallery_template' ) );
+        $template = apply_filters( 'instashop_gallery_template', $this->settings->get( 'product_gallery_template' ) );
+        $template = apply_filters( 'socialshop_gallery_template', $template );
 
         if ( $gallery_id && $product_id ) {
@@ -318 +324 @@
              * @param int    $product_id
              */
-            $product_source_language = apply_filters( 'socialshop_gallery_product_source_lang', null, $gallery_id, $product_id );
+            $product_source_language = apply_filters( 'instashop_gallery_product_source_lang', null, $gallery_id, $product_id );
+            $product_source_language = apply_filters( 'socialshop_gallery_product_source_lang', $product_source_language, $gallery_id, $product_id );
 
             if ( $product_source_language ) {
@@ -325 +332 @@
 
             $source = apply_filters( 'socialshop_gallery_source', '' );
+
 
             if ( $source ) {
@@ -340 +348 @@
             
             $output = str_replace( '{data}', $data_string, $template );
+
             echo apply_filters( 'socialshop_product_gallery', $output, $data );
         }
@@ -376 +385 @@
                 }
 
+
                 $priority = apply_filters( 'socialshop_product_gallery_display_priority', $priority, $location, $gallery_id );
+
                 add_action( 'woocommerce_after_single_product_summary', array( $this, 'display_product_gallery' ), $priority );
             }
@@ -388 +399 @@
      */
     public static function get_js_gallery_url  () {
-        return apply_filters( 'socialshop_js_gallery_url', self::JS_GALLERY_URL, self::JS_GALLERY_VERSION );
+        $url = apply_filters( 'instashop_js_gallery_url', self::JS_GALLERY_URL, self::JS_GALLERY_VERSION );
+
+        return apply_filters( 'socialshop_js_gallery_url', $url, self::JS_GALLERY_VERSION );
     }
 
@@ -397 +410 @@
      */
     public static function get_js_gallery_version  () {
-        return apply_filters( 'socialshop_js_gallery_version', self::JS_GALLERY_VERSION, self::JS_GALLERY_URL );
+        $url = apply_filters( 'instashop_js_gallery_version', self::JS_GALLERY_VERSION, self::JS_GALLERY_URL );
+
+        return apply_filters( 'socialshop_js_gallery_version', $url, self::JS_GALLERY_URL );
     }
 

instashop/trunk/readme.txt

@@ -92 +92 @@
 == Changelog ==
 
+
+
+
 = 2.0.1 =
 * Chore: Version bump to force WordPress hosting to reprocess upload.

instashop/trunk/socialshop.php

@@ -2 +2 @@
 /*
  * Plugin Name: SocialShop
- * Version: 2.0.1
+ * Version: 2.0.
  * Plugin URI: https://instashopapp.com/wordpress/
  * Description: Easily embed and manage your SocialShop galleries.
@@ -25 +25 @@
 // Load plugin libraries
 require_once( 'includes/class-socialshop-admin-api.php' );
+
 require_once( 'includes/class-socialshop-widget.php' );
 require_once( 'includes/class-socialshop-settings.php' );
@@ -35 +36 @@
  */
 function SocialShop () {
-    $instance = SocialShop::instance( __FILE__, '2.0.1' );
+    $instance = SocialShop::instance( __FILE__, '2.0.' );
 
     if ( is_null( $instance->settings ) ) {