gunnar: server/kolab-webclient/turba/patches/turba-2.3.3 t_turba_HK_GW_ConfigurationOverride.diff, NONE, 1.1 series, 1.3, 1.4 t_turba_HK_GW_ConfigurationOverride.php, 1.1, NONE
cvs at kolab.org
cvs at kolab.org
Wed Mar 24 08:55:50 CET 2010
Author: gunnar
Update of /kolabrepository/server/kolab-webclient/turba/patches/turba-2.3.3
In directory doto:/tmp/cvs-serv7540/patches/turba-2.3.3
Modified Files:
series
Added Files:
t_turba_HK_GW_ConfigurationOverride.diff
Removed Files:
t_turba_HK_GW_ConfigurationOverride.php
Log Message:
Fix patch name and remove two stray lines that caused notices.
--- NEW FILE: t_turba_HK_GW_ConfigurationOverride.diff ---
From: Gunnar Wrobel <p at rdus.de>
Subject: [PATCH] t/turba/HK/GW/ConfigurationOverride
Allow overriding configuration defaults.
STATUS: HACK
Signed-off-by: Gunnar Wrobel <p at rdus.de>
---
lib/Object.php | 6 +++++-
2 files changed, 7 insertions(+), 2 deletions(-)
--- a/config/sources.php.dist 2009-08-05 23:06:10.000000000 +0200
+++ b/config/sources.php.dist 2010-03-09 22:21:04.000000000 +0100
@@ -1074,3 +1074,16 @@
);
}
/* End Kolab sources. */
+
+// Load global configuration stanzas in .d directory
+$directory = dirname(__FILE__) . '/sources.d';
+if (file_exists($directory) && is_dir($directory)) {
+ $sub_files = glob("$directory/*.php");
+ if ($sub_files) {
+ foreach ($sub_files as $sub_file) {
+ ob_start();
+ $success = include $sub_file;
+ $output = ob_get_clean();
+ }
+ }
+}
--- a/config/attributes.php.dist 2008-11-12 07:29:26.000000000 +0100
+++ b/config/attributes.php.dist 2010-03-09 22:21:26.000000000 +0100
@@ -610,3 +610,16 @@
'type' => 'number',
'required' => false,
);
+
+// Load global configuration stanzas in .d directory
+$directory = dirname(__FILE__) . '/attributes.d';
+if (file_exists($directory) && is_dir($directory)) {
+ $sub_files = glob("$directory/*.php");
+ if ($sub_files) {
+ foreach ($sub_files as $sub_file) {
+ ob_start();
+ $success = include $sub_file;
+ $output = ob_get_clean();
+ }
+ }
+}
Index: series
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/turba/patches/turba-2.3.3/series,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- series 10 Mar 2010 05:19:24 -0000 1.3
+++ series 24 Mar 2010 07:55:48 -0000 1.4
@@ -1,5 +1,5 @@
t_turba_HK_GW_AllowAttributeDefaults.diff
t_turba_HK_GW_FixAddressbookDeletion.diff
t_turba_HK_GW_SyncMLrefresh.diff
-t_turba_HK_GW_ConfigurationOverride.php
-t_turba_HK_GW_AlternativeNameDetailView.diff
\ No newline at end of file
+t_turba_HK_GW_ConfigurationOverride.diff
+t_turba_HK_GW_AlternativeNameDetailView.diff
--- t_turba_HK_GW_ConfigurationOverride.php DELETED ---
More information about the commits
mailing list