diff --git a/boot.php b/boot.php index 1ad3249c18..82bd7c364b 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1221' ); +define ( 'FRIENDICA_VERSION', '2.3.1222' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DB_UPDATE_VERSION', 1115 ); diff --git a/include/conversation.php b/include/conversation.php index 293c5a84a3..6f235f701a 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -170,6 +170,10 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { load_contact_links(local_user()); + $cb = array('items' => $items, 'mode' => $mode, 'update' => $update, 'preview' => $preview); + call_hooks('conversation_start',$cb); + + $items = $cb['items']; $cmnt_tpl = get_markup_template('comment_item.tpl'); $tpl = get_markup_template('wall_item.tpl'); diff --git a/include/plugin.php b/include/plugin.php index 9f2832981a..fe325ac3b0 100644 --- a/include/plugin.php +++ b/include/plugin.php @@ -19,7 +19,7 @@ function uninstall_plugin($plugin){ if (! function_exists('install_plugin')){ function install_plugin($plugin){ logger("Addons: installing " . $plugin); - $t = filemtime('addon/' . $plugin . '/' . $plugin . '.php'); + $t = @filemtime('addon/' . $plugin . '/' . $plugin . '.php'); @include_once('addon/' . $plugin . '/' . $plugin . '.php'); if(function_exists($plugin . '_install')) { $func = $plugin . '_install'; @@ -33,6 +33,10 @@ function install_plugin($plugin){ $plugin_admin ); } + else { + logger("Addons: FAILED installing " . $plugin); + } + }} // reload all updated plugins diff --git a/view/theme/loozah/jot.tpl b/view/theme/loozah/jot.tpl index 78cbecea81..9bda1868e5 100644 --- a/view/theme/loozah/jot.tpl +++ b/view/theme/loozah/jot.tpl @@ -13,6 +13,7 @@ + @@ -58,7 +59,13 @@
+ + $preview + + + +