move all message display sub-functions from boot.php into conversation.php

5 files changed, 17 insertions, 11 deletions

diff --git a/mod/display.php b/mod/display.php
index da4566dc4..c8496160f 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -3,6 +3,11 @@
 
 function display_content(&$a) {
 
+	require_once("include/bbcode.php");
+	require_once('include/security.php');
+	require_once('include/conversation.php');
+
+
 	$o = '<div id="live-display"></div>' . "\r\n";
 
 	$nick = (($a->argc > 1) ? $a->argv[1] : '');
@@ -16,8 +21,6 @@ function display_content(&$a) {
 		return;
 	}
 
-	require_once("include/bbcode.php");
-	require_once('include/security.php');
 
 
 	$groups = array();
@@ -113,7 +116,6 @@ function display_content(&$a) {
 			);
 		}
 
-		require_once('include/conversation.php');
 
 		$o .= conversation($a,$r,'display', false);
 
diff --git a/mod/network.php b/mod/network.php
index 1b5ea5d65..35b6a299b 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -27,6 +27,8 @@ function network_init(&$a) {
 
 function network_content(&$a, $update = 0) {
 
+	require_once('include/conversation.php');
+
 	if(! local_user())
     	return login(false);
 
@@ -267,8 +269,6 @@ function network_content(&$a, $update = 0) {
 
 	$mode = (($nouveau) ? 'network-new' : 'network');
 
-	require_once('include/conversation.php');
-
 	$o .= conversation($a,$r,$mode,$update);
 
 	if(! $update) {
diff --git a/mod/photos.php b/mod/photos.php
index 757b4685d..186873a7b 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -657,6 +657,10 @@ function photos_content(&$a) {
 	// photos/name/image/xxxxx/edit
 
 
+	require_once('include/bbcode.php');
+	require_once('include/security.php');
+	require_once('include/conversation.php');
+
 	if(! x($a->data,'user')) {
 		notice( t('No photos selected') . EOL );
 		return;
@@ -893,8 +897,7 @@ function photos_content(&$a) {
 
 	if($datatype === 'image') {
 
-		require_once('security.php');
-		require_once('bbcode.php');
+
 
 		$o = '<div id="live-display"></div>' . "\r\n";
 		// fetch image, item containing image, then comments
diff --git a/mod/profile.php b/mod/profile.php
index 0a044069a..923f4fb90 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -50,6 +50,7 @@ function profile_content(&$a, $update = 0) {
 
 	require_once("include/bbcode.php");
 	require_once('include/security.php');
+	require_once('include/conversation.php');
 
 	$groups = array();
 
@@ -289,7 +290,6 @@ function profile_content(&$a, $update = 0) {
 		$o .= get_birthdays();
 
 
-	require_once('include/conversation.php');
 
 	$o .= conversation($a,$r,'profile',$update);
 
diff --git a/mod/search.php b/mod/search.php
index 23b2ddb7e..793a8c2bb 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -9,6 +9,10 @@ function search_post(&$a) {
 
 function search_content(&$a) {
 
+	require_once("include/bbcode.php");
+	require_once('include/security.php');
+	require_once('include/conversation.php');
+
 	if(x($_SESSION,'theme'))
 		unset($_SESSION['theme']);
 
@@ -26,8 +30,6 @@ function search_content(&$a) {
 	if(! $search)
 		return $o;
 
-	require_once("include/bbcode.php");
-	require_once('include/security.php');
 
 	$sql_extra = "
 		AND `item`.`allow_cid` = '' 
@@ -81,7 +83,6 @@ function search_content(&$a) {
 	);
 
 
-	require_once('include/conversation.php');
 
 	$o .= conversation($a,$r,'search',false);