From 680483d4e4eb805ca7113fd2f6fb2d473bff1d67 Mon Sep 17 00:00:00 2001
From: ceb <ceb@alumni.egroupware.org>
Date: Mon, 28 Oct 2002 01:31:33 +0000
Subject: [PATCH] update about

---
 about.php                            |  6 +++++-
 admin/setup/setup.inc.php            | 20 ++++++++++++--------
 phpgwapi/templates/default/about.xsl |  2 +-
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/about.php b/about.php
index 68f8045d22..65c88303ed 100644
--- a/about.php
+++ b/about.php
@@ -37,7 +37,6 @@
 			'author',
 			'license',
 			'based_on',
-			'based_on_url',
 			'maintainer'
 		);
 		while (list(,$field) = each($fields))
@@ -49,6 +48,11 @@
 				$app_data[$field] = lang($setup_info[$app][$field]);
 			}
 		}
+
+		if (isset($app_data['note']) && !empty($app_data['note']))
+		{
+			$app_data['note'] = lang($app_data['note']);
+		}
 	}
 
 	$data = array
diff --git a/admin/setup/setup.inc.php b/admin/setup/setup.inc.php
index ee9b5e2645..49b3cabe31 100755
--- a/admin/setup/setup.inc.php
+++ b/admin/setup/setup.inc.php
@@ -51,14 +51,18 @@
 	$setup_info['admin']['description'] = 'phpGroupWare administration application';
 
 	/* The hooks this app includes, needed for hooks registration */
-	$setup_info['admin']['hooks'][] = 'acl_manager';
-	$setup_info['admin']['hooks'][] = 'add_def_pref';
-	$setup_info['admin']['hooks'][] = 'admin';
-	$setup_info['admin']['hooks'][] = 'after_navbar';
-	$setup_info['admin']['hooks'][] = 'config';
-	$setup_info['admin']['hooks'][] = 'deleteaccount';
-	$setup_info['admin']['hooks'][] = 'manual';
-	$setup_info['admin']['hooks'][] = 'view_user';
+
+	$setup_info['admin']['hooks'] = array
+	(
+		'acl_manager',
+		'add_def_pref',
+		'admin',
+		'after_navbar',
+		'config',
+		'deleteaccount',
+		'manual',
+		'view_user'
+	);
 
 	/* Dependencies for this app to work */
 	$setup_info['admin']['depends'][] = array
diff --git a/phpgwapi/templates/default/about.xsl b/phpgwapi/templates/default/about.xsl
index ca0de089b9..822f08dff4 100644
--- a/phpgwapi/templates/default/about.xsl
+++ b/phpgwapi/templates/default/about.xsl
@@ -56,7 +56,7 @@
 		<xsl:if test="note != ''">
 			<tr>
 				<td colspan="2">
-					<i><xsl:value-of select="note"/></i>
+					<i><xsl:value-of disable-output-escaping="yes" select="note"/></i>
 				</td>
 			</tr>
 		</xsl:if>