Changeset 2028426

Timestamp:

02/11/2019 11:28:20 AM (7 years ago)

Author:

Nitay

Message:

fixed function name conflict

Location:

sponsors-carousel/trunk

Files:

• class-sponsors-carousel.php (modified) (1 diff)
• readme.txt (modified) (1 diff)
• sponsors-carousel.php (modified) (7 diffs)

sponsors-carousel/trunk/class-sponsors-carousel.php

@@ -61 +61 @@
             }
         }
-    }
-
-    public function empty() {
-        return empty($this->images);
     }
 

sponsors-carousel/trunk/readme.txt

@@ -71 +71 @@
 * 4.00: Introduced Gutenberg editor block
 * 4.01: Added WP image size chooser to set scale/crop images and carousel copy button.
+* 4.02: fixed function name conflict, thanks @merchtemeaglesadmin

sponsors-carousel/trunk/sponsors-carousel.php

@@ -4 +4 @@
  * Plugin URI: http://wordpress.org/extend/plugins/sponsors-carousel
  * Description: Sponsors logos on javascript carousel.
- * Version: 4.01
+ * Version: 4.02
  * Author: Sergey Panasenko <[email protected]>
  * Text Domain: sponsors-carousel
@@ -42 +42 @@
 
 add_action( 'wp_enqueue_scripts',  function () {
-    wp_enqueue_script( 'jcarousel', plugins_url( '/js/jquery.jcarousel.min.js', __FILE__ ), ['jquery'], SPONSORS_CAROUSEL_VERSION);
-    wp_enqueue_script( 'jcarousel-autoscroll', plugins_url( '/js/jquery.jcarousel-autoscroll.min.js', __FILE__ ), ['jquery','jcarousel'], SPONSORS_CAROUSEL_VERSION );
-    wp_enqueue_script( 'sponsors-carousel', plugins_url( '/js/sponsors-carousel.js', __FILE__ ), ['jquery','jcarousel','jcarousel-autoscroll'], SPONSORS_CAROUSEL_VERSION );
+    wp_enqueue_script( 'jcarousel',
+            plugins_url( '/js/jquery.jcarousel.min.js', __FILE__ ),
+            ['jquery'], SPONSORS_CAROUSEL_VERSION);
+    wp_enqueue_script( 'jcarousel-autoscroll',
+            plugins_url( '/js/jquery.jcarousel-autoscroll.min.js', __FILE__ ),
+            ['jquery','jcarousel'], SPONSORS_CAROUSEL_VERSION );
+    wp_enqueue_script( 'sponsors-carousel',
+            plugins_url( '/js/sponsors-carousel.js', __FILE__ ),
+            ['jquery','jcarousel','jcarousel-autoscroll'],
+            SPONSORS_CAROUSEL_VERSION );
 } );
 
 add_action('wp_print_styles',  function () {
     wp_enqueue_style( 'dashicons' );
-    wp_enqueue_style( 'sponsors-carousel', plugins_url( '/css/sponsors-carousel.css', __FILE__ ) );
+    wp_enqueue_style( 'sponsors-carousel',
+            plugins_url( '/css/sponsors-carousel.css', __FILE__ ) );
 } );
 
 add_action('admin_init', function () {
-    wp_register_script( 'sponsors-carousel-admin', plugins_url( '/js/sponsors-carousel-admin.js', __FILE__ ),['jquery', 'jquery-ui-core', 'jquery-ui-sortable'], SPONSORS_CAROUSEL_VERSION );
-    wp_register_style( 'sponsors-carousel-admin', plugins_url( '/css/sponsors-carousel-admin.css', __FILE__ ), [], SPONSORS_CAROUSEL_VERSION );
-    add_action( 'wp_ajax_sponsors_carousel_change_link', 'scwp_wp_ajax_sponsors_carousel_change_link');
+    wp_register_script( 'sponsors-carousel-admin',
+            plugins_url( '/js/sponsors-carousel-admin.js', __FILE__ ),
+            ['jquery', 'jquery-ui-core', 'jquery-ui-sortable'],
+            SPONSORS_CAROUSEL_VERSION );
+    wp_register_style( 'sponsors-carousel-admin',
+            plugins_url( '/css/sponsors-carousel-admin.css', __FILE__ ),
+            [], SPONSORS_CAROUSEL_VERSION );
+    add_action( 'wp_ajax_sponsors_carousel_change_link',
+            'scwp_wp_ajax_sponsors_carousel_change_link');
 });
 
@@ -77 +91 @@
     if ($file == plugin_basename(__FILE__)) {
         $link = admin_url('admin.php?page=sponsors_carousel');
-        $dashboard_link = "<a href=\"{$link}\">" . __( 'Settings', 'sponsors-carousel' ) . "</a>";
+        $dashboard_link = "<a href=\"{$link}\">";
+        $dashboard_link .= __( 'Settings', 'sponsors-carousel' ) . "</a>";
         array_unshift($links, $dashboard_link);
     }
@@ -98 +113 @@
 function scwp_options_page() {
 
-    if ( isset( $_POST['save'] ) ) { // Update options
+    // Update options
+    if ( isset( $_POST['save'] ) ) {
         $sponsors_carousel = new SponsorsCarousel();
         if ( $sponsors_carousel->update( $_POST ) ) {
-            echo "<div class='updated fade'><p><strong>" . __( 'Options updated', 'sponsors-carousel' ) . "</strong></p></div>";
+            echo "<div class='updated fade'><p><strong>";
+            echo __( 'Options updated', 'sponsors-carousel' );
+            echo "</strong></p></div>";
         }
     }
 
-    if ( isset( $_GET['copy'] ) ) { // Update options
+    // Copy carousel
+    if ( isset( $_GET['copy'] ) ) {
         $sponsors_carousel = new SponsorsCarousel($_GET['id']);
         echo $sponsors_carousel->copy($_GET['copy']);
     }
 
-    if ( isset( $_GET['delete'] ) && isset( $_GET['id'] ) && intval( $_GET['id'] ) == intval( $_GET['delete'] ) ) { // Delete carousel
+    // Delete carousel
+    if ( isset( $_GET['delete'] ) && isset( $_GET['id'] ) &&
+            intval( $_GET['id'] ) == intval( $_GET['delete'] ) ) {
         echo SponsorsCarousel::delete( intval( $_GET['delete'] ) );
         die();
     }
 
+    // Show admin page
     global $scwp_plugin_name;
-    echo '<h2>' . sprintf( __( '%s Settings', 'sponsors-carousel' ), $scwp_plugin_name ) . '</h2>';
+    echo '<h2>' . sprintf( __( '%s Settings', 'sponsors-carousel' ),
+            $scwp_plugin_name ) . '</h2>';
     $id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
     $sponsors_carousel = new SponsorsCarousel( $id );
@@ -132 +155 @@
         $list = get_option( 'sponsors-carousels', '0' );
         $ids = explode( ',', $list );
-        $list = array( array( 'value' => 0, 'label' => __( 'main', 'sponsors-carousel' )));
+        $list = array( array( 'value' => 0,
+                'label' => __( 'main', 'sponsors-carousel' )));
         foreach ( $ids as $id ) {
             if ( $id > 0 ) {
@@ -144 +168 @@
             array( 'wp-blocks', 'wp-element', 'wp-components', 'wp-editor' )
         );
-        wp_enqueue_style( 'sponsors-carousel', plugins_url( '/css/sponsors-carousel.css', __FILE__ ) );
+        wp_enqueue_style( 'sponsors-carousel',
+                plugins_url( '/css/sponsors-carousel.css', __FILE__ ) );
 
         register_block_type( 'sponsors-carousel/block', array(
@@ -170 +195 @@
 function sponsors_carousel_block_render( $attributes ) {
     $sc = sponsors_carousel( isset( $attributes['id'] ) ? $attributes['id'] : 0 );
-    return empty( $sc ) ? ( '<p>' . __( 'Please add images on <b>Sponsors carousel</b> plugin page', 'sponsors-carousel' ) . '</p>' ) : $sc;
-}
+    $message = __( 'Please add images on <b>Sponsors carousel</b> plugin page',
+            'sponsors-carousel' );
+    return empty( $sc ) ? ( '<p>' . $message . '</p>' ) : $sc;
+}