Merge branch 'fabrixxm-master'

Conflicts:
	boot.php

diff --cc boot.php
index 3cc98cc9b6febe84034872b87d26d5da8d20c68a,d3187648c7859d25e478fc1d94562fc2c421b0b8..223c9416d1c62d4e07dd78ee8d245efbd08d2dc7
--- 1/boot.php
--- 2/boot.php
+++ b/boot.php
@@@ -2217,15 -2216,29 +2216,39 @@@ function link_compare($a,$b) 
  }}
  
  
 +if(! function_exists('prepare_body')) {
 +function prepare_body($item) {
 +
 +      require_once('include/bbcode.php');
 +
 +      $s = smilies(bbcode($item['body']));
 +
 +      return $s;
++}}
 +
+ /**
+  * 
+  * Wrap calls to proc_close(proc_open()) and call hook
+  * so plugins can take part in process :)
+  * 
+  * args:
+  * $cmd program to run
+  *  next args are passed as $cmd command line
+  * 
+  * e.g.: proc_run("ls","-la","/tmp");
+  * 
+  * $cmd and string args are surrounded with ""
+  */
 +
+ if(! function_exists('run_proc')) {
+ function proc_run($cmd){
+       $args = func_get_args();
+       call_hooks("proc_run", $args);
+       
+       foreach ($args as &$arg){
+               if(is_string($arg)) $arg='"'.$arg.'"';
+       }
+       $cmdline = implode($args," ");
+       proc_close(proc_open($cmdline." &",array(),$foo));
+ }}
  
- }}
 -?>

diff --cc mod/dfrn_notify.php
Simple merge

diff --cc mod/follow.php
Simple merge

diff --cc mod/photos.php
Simple merge

diff --cc mod/settings.php
Simple merge