Index: /extensions/FacebookPlug/Plugin/tpl/social.plugin.comments.tpl
===================================================================
--- /extensions/FacebookPlug/Plugin/tpl/social.plugin.comments.tpl	(revision 8295)
+++ /extensions/FacebookPlug/Plugin/tpl/social.plugin.comments.tpl	(revision 8400)
@@ -1,5 +1,5 @@
 <div id="fb-xfbml-comments">
 <fb:comments
-  xid="{$fbp_urlencode_picture}" url="{$fbp_url_picture}"
+  xid="{$fbp_url_picture|@urlencode}" url="{$fbp_url_picture}"
   width="{$fbp.social_plugin_comments.width}"
   numposts="{$fbp.social_plugin_comments.numposts}"
Index: /tensions/FacebookPlug/Plugin/tpl/header.tpl
===================================================================
--- /extensions/FacebookPlug/Plugin/tpl/header.tpl	(revision 8395)
+++ 	(revision )
@@ -1,4 +1,0 @@
-{html_head}
-<meta property="og:image" content="{$fbp_url_image}">
-<meta property="og:url" content="{$fbp_url_picture}">
-{/html_head}
Index: /extensions/FacebookPlug/Plugin/include/header.inc.php
===================================================================
--- /extensions/FacebookPlug/Plugin/include/header.inc.php	(revision 8395)
+++ /extensions/FacebookPlug/Plugin/include/header.inc.php	(revision 8400)
@@ -51,5 +51,5 @@
     $template->assign('LANGUAGE', $user['language']);
     $template->assign('fbp', $conf['fbp']);
-    $template->smarty->register_modifier('boolean_to_string', 'boolean_to_string');
+    //~ $template->smarty->register_modifier('boolean_to_string', 'boolean_to_string');
   }
 }
@@ -72,8 +72,4 @@
       }
     }
-    //~ if (empty($page['fbp']['url_image']))
-    //~ {
-    //~ // todo
-    //~ }
 
     $template->assign('fbp_page', $page['fbp']);
Index: /extensions/FacebookPlug/Plugin/include/picture.inc.php
===================================================================
--- /extensions/FacebookPlug/Plugin/include/picture.inc.php	(revision 8395)
+++ /extensions/FacebookPlug/Plugin/include/picture.inc.php	(revision 8400)
@@ -67,5 +67,4 @@
     // Assign template
     $template->assign('fbp_url_picture', $fbp_url_picture);
-    $template->assign('fbp_urlencode_picture', urlencode($fbp_url_picture));
 
     // Parse TPL