[debian-edu-commits] debian-edu/slbackup-php.git (#14) - edu-wheezy (branch) updated: debian/0.3-2.2-13-g23b8026

[Mike Gabriel]

The branch, edu-wheezy has been updated
       via  23b8026285b4e02192d90872edb9a7aee3f70183 (commit)
      from  aa4335d7000facc21179f428f0acfd4f6f6b6871 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                           |    2 ++
 debian/patches/001_slbackup-php_cookie+request-merge.patch |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index f3178a1..cfc0337 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ slbackup-php (0.3-2.3) UNRELEASED; urgency=low
     of files with blanks in their name. Closes: #565181.
     Patch provided by Cyril ETCHEVERRIA <cyril.e at wanadoo.fr> -> thanks!
   * Add/update patch headers.
+  * Update patch: 001_slbackup-php_cookie+request-merge.patch. Allow `locale'
+    as $_COOKIE key.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sun, 15 Jan 2012 13:40:20 +0100
 
diff --git a/debian/patches/001_slbackup-php_cookie+request-merge.patch b/debian/patches/001_slbackup-php_cookie+request-merge.patch
index 2592c49..5408d99 100644
--- a/debian/patches/001_slbackup-php_cookie+request-merge.patch
+++ b/debian/patches/001_slbackup-php_cookie+request-merge.patch
@@ -31,7 +31,7 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 +$arguments = $_REQUEST;
 +
 +# merge _COOKIE and _REQUEST
-+$allowed_cookie_keys = array('nonhttps', 'xorstring', 'PHPSESSID');
++$allowed_cookie_keys = array('nonhttps', 'xorstring', 'PHPSESSID', 'locale',);
 +foreach ($_COOKIE as $key => $value) {
 +    if ((! array_key_exists($key, $arguments)) && (in_array($key, $allowed_cookie_keys))) {
 +	if (is_string($key) && is_string($value)) {


hooks/post-receive
-- 
slbackup-php.git (Debian package slbackup-php)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "slbackup-php.git" (Debian package slbackup-php).