Changeset 592497

Timestamp:

08/30/2012 04:28:57 PM (13 years ago)

Author:

niccolo_tapparo

Message:

version 1.1.7 - bugfix

Location:

wordpress-social-ring

Files:

• tags/1.1.8 (added)
• tags/1.1.8/admin (added)
• tags/1.1.8/admin/admin.php (added)
• tags/1.1.8/admin/css (added)
• tags/1.1.8/admin/css/style.css (added)
• tags/1.1.8/admin/images (added)
• tags/1.1.8/admin/images/altervista.gif (added)
• tags/1.1.8/admin/images/av-16x16.png (added)
• tags/1.1.8/admin/images/av32px.png (added)
• tags/1.1.8/images (added)
• tags/1.1.8/images/facebook.png (added)
• tags/1.1.8/includes (added)
• tags/1.1.8/includes/library.php (added)
• tags/1.1.8/includes/share.php (added)
• tags/1.1.8/includes/widgets.php (added)
• tags/1.1.8/langs (added)
• tags/1.1.8/langs/wp_social_ring-es_ES.mo (added)
• tags/1.1.8/langs/wp_social_ring-es_ES.po (added)
• tags/1.1.8/langs/wp_social_ring-it_IT.mo (added)
• tags/1.1.8/langs/wp_social_ring-it_IT.po (added)
• tags/1.1.8/readme.txt (added)
• tags/1.1.8/screenshot-1.png (added)
• tags/1.1.8/screenshot-2.png (added)
• tags/1.1.8/wp-social-ring.php (added)
• trunk/includes/library.php (modified) (2 diffs)
• trunk/readme.txt (modified) (2 diffs)
• trunk/wp-social-ring.php (modified) (1 diff)

wordpress-social-ring/trunk/includes/library.php

@@ -16 +16 @@
         echo "<meta property=\"og:site_name\" content=\"".esc_attr(get_bloginfo('name'))."\" />\n";
         echo "<meta property=\"og:description\" content=\"".esc_attr(social_ring_make_excerpt($post))."\" />\n";
-        if ( empty( $image ) && function_exists('has_post_thumbnail') && has_post_thumbnail( $post->ID ) ) {
-            $thumbnail = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), 'post-thumbnail' );
-            if ( $thumbnail )
-                $image = $thumbnail[0];
-        // If that's not there, grab the first attached image
-        } else {
-            $files = get_children( 
-                        array( 
-                        'post_parent' => $post->ID,
-                        'post_type' => 'attachment',
-                        'post_mime_type' => 'image',
-                        ) 
-                    );
-            if ( $files ) {
-                $keys = array_reverse( array_keys( $files ) );
-                $image = image_downsize( $keys[0], 'thumbnail' );
-                $image = $image[0];
-            //if there's no attached image, try to grab first image in content
-            } else {
-                $image = social_ring_get_first_image();
-            }
-        }   
+        $image = social_ring_get_first_image();
         if ( $image != '' ) {
             echo "<meta property=\"og:image\" content=\"".esc_attr( $image )."\" />\n";
@@ -47 +26 @@
 
 function social_ring_get_first_image() {
-  global $post, $posts;
-  $first_img = '';
-  ob_start();
-  ob_end_clean();
-
-  $output = preg_match_all('/<img.+src=[\'"]([^\'"]+)[\'"].*>/i',
-       $post->post_content, $matches);
-  $first_img = $matches [1] [0];
-
-  return $first_img;
+  
+    global $post, $posts;
+  
+    if ( function_exists('has_post_thumbnail') && has_post_thumbnail( $post->ID ) ) {
+        
+        $thumbnail = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), 'post-thumbnail' );
+        if ( $thumbnail )
+            $image = $thumbnail[0];
+            
+    // If that's not there, grab the first attached image
+    } else {
+        
+        $files = get_children( 
+            array( 
+            'post_parent' => $post->ID,
+            'post_type' => 'attachment',
+            'post_mime_type' => 'image',
+            ) 
+        );
+        if ( $files ) {
+            $keys = array_reverse( array_keys( $files ) );
+            $image = image_downsize( $keys[0], 'thumbnail' );
+            $image = $image[0];
+        }
+    }
+    //if there's no attached image, try to grab first image in content
+    if(empty($image)) {
+        ob_start();
+        ob_end_clean();
+        $output = preg_match_all('/<img.+src=[\'"]([^\'"]+)[\'"].*>/i',
+             $post->post_content, $matches);
+        if(!empty($matches[1][0])) {
+              $image = $matches[1][0];
+        }
+    }
+
+    return $image;
 }
 

wordpress-social-ring/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.2
 Tested up to: 3.4
-Version: 1.1.7
-Stable tag: 1.1.7
+Version: 1.1.8
+Stable tag: 1.1.8
 
 WordPress Social Ring adds sharing buttons for Facebook, Twitter and Google+.
@@ -35 +35 @@
 
 == Changelog ==
+
+= 1.1.8 =
+
+* Bugfix
 
 = 1.1.7 =

wordpress-social-ring/trunk/wp-social-ring.php

@@ -4 +4 @@
 Description: Let visitors share posts/pages on Facebook, Twitter and Google+. From admin page you can choose which button display: Facebook Like, Facebook Send, Facebook Share, Google +1 and Twitter.
 Author: Niccolò Tapparo
-Version: 1.1.7
+Version: 1.1.8
 Author URI: http://wordpress.altervista.org/
 Plugin URI: http://wordpress.altervista.org/en/tag/wordpress-social-ring-en/