From cc65688b3da3e16729a1f73dd50fd975bd1ff741 Mon Sep 17 00:00:00 2001
From: hellkat <hellkat@ispconfig3>
Date: Tue, 26 Mar 2013 00:43:51 -0400
Subject: [PATCH] Merged revisions 3845-3876 and 3879-3918 from stable branch.
---
interface/web/sites/aps_installedpackages_list.php | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/interface/web/sites/aps_installedpackages_list.php b/interface/web/sites/aps_installedpackages_list.php
index c3933c5..e3c318f 100644
--- a/interface/web/sites/aps_installedpackages_list.php
+++ b/interface/web/sites/aps_installedpackages_list.php
@@ -90,7 +90,7 @@
aps_instances.instance_status AS instance_status, aps_packages.name AS package_name,
aps_packages.version AS package_version, aps_packages.release AS package_release,
aps_packages.package_status AS package_status,
- CONCAT ((SELECT value FROM aps_instances_settings WHERE name='main_domain' AND instance_id = aps_instances.id),
+ CONCAT((SELECT value FROM aps_instances_settings WHERE name='main_domain' AND instance_id = aps_instances.id),
'/', (SELECT value FROM aps_instances_settings WHERE name='main_location' AND instance_id = aps_instances.id))
AS install_location
FROM aps_instances, aps_packages, client
@@ -101,7 +101,7 @@
aps_instances.instance_status AS instance_status, aps_packages.name AS package_name,
aps_packages.version AS package_version, aps_packages.release AS package_release,
aps_packages.package_status AS package_status,
- CONCAT ((SELECT value FROM aps_instances_settings WHERE name='main_domain' AND instance_id = aps_instances.id),
+ CONCAT((SELECT value FROM aps_instances_settings WHERE name='main_domain' AND instance_id = aps_instances.id),
'/', (SELECT value FROM aps_instances_settings WHERE name='main_location' AND instance_id = aps_instances.id))
AS install_location
FROM aps_instances, aps_packages, sys_group
@@ -139,4 +139,4 @@
$app->tpl->setLoop('records', $records_new);
$app->listform_actions->onShow();
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1