Ticket #1229: improved.diff

opengraph.php

@@ -82 +82 @@
  */
 function opengraph_default_title( $title ) {
         if ( is_singular() && empty($title) ) {
-                global $post;
-                $title = $post->post_title;
+                global $wp_query;
+                $title = $wp_query->queried_object->post_title;
         }
 
         return $title;
@@ -103 +103 @@
  * Default image property, using the post-thumbnail.
  */
 function opengraph_default_image( $image ) {
-        global $post;
-        if ( is_singular() && empty($image) && has_post_thumbnail($post->ID) ) {
-                $thumbnail = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), 'post-thumbnail');
+        global $wp_query;
+        if ( is_singular() && empty($image) && current_theme_supports('post-thumbnails') && has_post_thumbnail($wp_query->queried_object_id) ) {
+                $thumbnail = wp_get_attachment_image_src( get_post_thumbnail_id( $wp_query->queried_object_id ), 'post-thumbnail');
                 if ($thumbnail) {
                         $image = $thumbnail[0];
                 }
@@ -119 +119 @@
  * Default url property, using the permalink for the page.
  */
 function opengraph_default_url( $url ) {
-        if ( empty($url) ) $url = get_permalink();
+    if ( ! empty( $url )) return $url;
+
+        if ( is_singular() ) {
+                global $wp_query;
+                $url = get_permalink($wp_query->queried_object_id);
+        }else{
+                $url = trailingslashit( get_bloginfo('url' ));
+        }
+
         return $url;
 }
 
@@ -137 +145 @@
  * Default description property, using the bloginfo description.
  */
 function opengraph_default_description( $description ) {
-        if ( empty($description) ) $description = get_bloginfo('description');
-        return $description;
+    if ( !empty($description) ) return $description;
+
+        // get blog description as default
+    $description = get_bloginfo('description');
+
+        // replace the description with a more specific one if available
+    global $wp_query;
+    if ( is_singular() && ! empty($wp_query->queried_object->post_excerpt) )
+                $description = $wp_query->queried_object->post_excerpt;
+
+    return $description;
 }