gunnar: server/php-kolab/Kolab_Filter revert_issue2499.patch, NONE, 1.1.2.1 Kolab_Filter.spec, 1.19.2.1, 1.19.2.2 Makefile, 1.8.2.1, 1.8.2.2
cvs at kolab.org
cvs at kolab.org
Fri Mar 20 08:05:11 CET 2009
Author: gunnar
Update of /kolabrepository/server/php-kolab/Kolab_Filter
In directory doto:/tmp/cvs-serv31763/php-kolab/Kolab_Filter
Modified Files:
Tag: kolab_2_2_branch
Kolab_Filter.spec Makefile
Added Files:
Tag: kolab_2_2_branch
revert_issue2499.patch
Log Message:
Reverted changes for kolab/issue2499 (Notification messages by
the resource manager sould be localized). A solution to this
issue had been included in upstream release Kolab_Filter-0.1.4
but did not work properly yet.
--- NEW FILE: revert_issue2499.patch ---
diff --git a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Base.php b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Base.php
index baf33a4..865132a 100644
--- a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Base.php
+++ b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Base.php
@@ -243,12 +243,6 @@ class Horde_Kolab_Filter_Base
Horde::logMessage(sprintf("Arguments: %s", print_r($values, true)),
__FILE__, __LINE__, PEAR_LOG_DEBUG);
- if (!empty($conf['kolab']['filter']['locale_path'])
- && !empty($conf['kolab']['filter']['locale'])) {
- require_once 'Horde/NLS.php';
- NLS::setTextdomain('Kolab_Filter', $conf['kolab']['filter']['locale_path'], NLS::getCharset());
- setlocale(LC_ALL, $conf['kolab']['filter']['locale']);
- }
/* This is used as the default domain for unqualified adresses */
global $_SERVER;
diff --git a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Content.php b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Content.php
index f2c9976..89419f0 100644
--- a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Content.php
+++ b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Content.php
@@ -438,8 +438,7 @@ class Horde_Kolab_Filter_Content extends Horde_Kolab_Filter_Base
} else {
$name = '';
}
- $new_from = '"' . $name . ' ' . $untrusted . '" <' . $from . '>';
- return '=?utf-8?B?' . base64_encode($new_from) . '?=';
+ return '"' . $name . ' ' . $untrusted . '" <' . $from . '>';
} else {
return true;
}
Index: Kolab_Filter.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Kolab_Filter.spec,v
retrieving revision 1.19.2.1
retrieving revision 1.19.2.2
diff -u -d -r1.19.2.1 -r1.19.2.2
--- Kolab_Filter.spec 17 Mar 2009 11:46:16 -0000 1.19.2.1
+++ Kolab_Filter.spec 20 Mar 2009 07:05:09 -0000 1.19.2.2
@@ -23,6 +23,7 @@
Patch1: issue3192.patch
Patch2: issue3441.patch
Patch3: dovecotlda-quoting.patch
+Patch4: revert_issue2499.patch
# Build Info
Prefix: %{l_prefix}
@@ -61,6 +62,7 @@
%patch -p1 -P 1
%patch -p1 -P 2
%patch -p1 -P 3
+ %patch -p3 -P 4
cp %{S:1} .
%build
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Makefile,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -d -r1.8.2.1 -r1.8.2.2
--- Makefile 17 Mar 2009 11:46:16 -0000 1.8.2.1
+++ Makefile 20 Mar 2009 07:05:09 -0000 1.8.2.2
@@ -21,7 +21,7 @@
SOURCE_URL=http://pear.horde.org/get
SOURCE_0=$(PACKAGE)-$(VERSION).tgz
-EXTRA=ChangeLog issue3435.patch issue3192.patch issue3441.patch dovecotlda-quoting.patch package.xml
+EXTRA=ChangeLog revert_issue2499.patch issue3435.patch issue3192.patch issue3441.patch dovecotlda-quoting.patch package.xml
.PHONY: all
all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
More information about the commits
mailing list