From: Jan Schneider <jan@horde.org>
Date: Fri, 5 Mar 2010 18:40:59 +0000 (+0100)
Subject: Fix configuration name.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=148da9d4b65170f961b45c1cfa19d531ae377b68;p=horde.git

Fix configuration name.
---

diff --git a/horde/services/shares/edit.php b/horde/services/shares/edit.php
index ae7dbd612..e8a0665d2 100644
--- a/horde/services/shares/edit.php
+++ b/horde/services/shares/edit.php
@@ -90,7 +90,7 @@ case 'editform':
         }
 
         if (Horde_Auth::isAdmin() ||
-            !empty($GLOBALS['conf']['shares']['world'])) {
+            !empty($GLOBALS['conf']['share']['world'])) {
             // Process default permissions.
             if (Horde_Util::getFormData('default_show')) {
                 $perm->addDefaultPermission(Horde_Perms::SHOW, false);
diff --git a/horde/templates/shares/edit.inc b/horde/templates/shares/edit.inc
index bff7a049f..72044f66d 100644
--- a/horde/templates/shares/edit.inc
+++ b/horde/templates/shares/edit.inc
@@ -50,7 +50,7 @@ if (isset($userperms[$owner])) {
   </td>
 </tr>
 
-<?php if (Horde_Auth::isAdmin() || !empty($GLOBALS['conf']['shares']['world'])): ?>
+<?php if (Horde_Auth::isAdmin() || !empty($GLOBALS['conf']['share']['world'])): ?>
 <!-- Spacer -->
 <tr><td>&nbsp;</td></tr>
 
diff --git a/kronolith/perms.php b/kronolith/perms.php
index 661ee19c6..e9aa7284f 100644
--- a/kronolith/perms.php
+++ b/kronolith/perms.php
@@ -74,7 +74,7 @@ case 'editform':
         }
 
         if (Horde_Auth::isAdmin() ||
-            !empty($GLOBALS['conf']['shares']['world'])) {
+            !empty($GLOBALS['conf']['share']['world'])) {
             // Process default permissions.
             if (Horde_Util::getFormData('default_show')) {
                 $perm->addDefaultPermission(Horde_Perms::SHOW, false);
diff --git a/kronolith/templates/perms/perms.inc b/kronolith/templates/perms/perms.inc
index 8fcc9a947..6d31436e6 100644
--- a/kronolith/templates/perms/perms.inc
+++ b/kronolith/templates/perms/perms.inc
@@ -40,7 +40,7 @@
   </td>
 </tr>
 
-<?php if (Horde_Auth::isAdmin() || !empty($GLOBALS['conf']['shares']['world'])): ?>
+<?php if (Horde_Auth::isAdmin() || !empty($GLOBALS['conf']['share']['world'])): ?>
 <!-- Spacer -->
 <tr><td colspan="7">&nbsp;</td></tr>