Merge branch 'master' into subscription

* master: (175 commits)
  some coding style improvements
  added .idea project folder to gitignore
  use correct setUp method and parent calls.
  Correct German plugin manager translation (download != install)
  correct return in sendDigest()
  Fix case-insensitive match in ACL checking
  GeSHi update to 1.0.8.11
  ignore empty header on mail sending
  remove empty BCC/CC mail headers
  Galician language update
  some welcome page changes
  Combine subsequent calls to strtr into a single transformation
  changed semicolon to colon in link to welcome page to make it less confusing
  fixed wrong sidebar showing in namespaces when sidebar is disabled
  Typo fix for TL;DR
  removed a bunch of outdated and irrelevant networking acronyms
  added another place to look for logo to make it more consistent (FS#2656)
  French language update
  Czech language update
  compat js findPosX/y more closely mimic historical function
  ...

Conflicts:
	inc/auth.php
	inc/common.php
	inc/subscription.php
	lib/exe/indexer.php

1 files changed, 20 insertions, 0 deletions

diff --git a/_test/tests/inc/subscription_set.test.php b/_test/tests/inc/subscription_set.test.php
new file mode 100644
index 000000000..5c0a6c816
--- /dev/null
+++ b/_test/tests/inc/subscription_set.test.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Tests the subscription set function
+ */
+class subscription_set_test extends DokuWikiTest {
+    /**
+     * Tests, if overwriting subscriptions works even when subscriptions for the same
+     * user exist for two nested namespaces, this is a test for the bug described in FS#2580
+     */
+    function test_overwrite() {
+        subscription_set('admin', ':', 'digest', '123456789');
+        subscription_set('admin', ':wiki:', 'digest', '123456789');
+        subscription_set('admin', ':', 'digest', '1234', true);
+        subscription_set('admin', ':wiki:', 'digest', '1234', true);
+        $subscriptions = subscription_find(':wiki:', array('user' => 'admin'));
+        $this->assertCount(1, $subscriptions[':'], 'More than one subscription saved for the root namespace even though the old one should have been overwritten.');
+        $this->assertCount(1, $subscriptions[':wiki:'], 'More than one subscription saved for the wiki namespace even though the old one should have been overwritten.');
+        $this->assertCount(2, $subscriptions, 'Didn\'t find the expected two subscriptions');
+    }
+}