Merge branch 'subscription' Pull Request #125

* subscription: (25 commits)
  link directly to subscription management in mails
  only use mailfromnobody for bulk mails
  added missing context for list mails
  readded mailfromnobody to subscription sending
  correctly escape diffs in HTML mails
  fixed lists in HTML mails
  simplified subscription->add() code a bit
  comment adjusted
  removed unused vars
  removed data parameter in subscription_handle_post()
  fixed tests
  some reformatting
  added compatibility function
  moved registration notification to subscription class
  fixed merge error in inc/auth.php
  consolidate more notification code in subscription class
  minor cleanup
  initialize new subscriptions with current time
  fixed subscription management
  correctly check if subscriptions are enabled
  ...

1 files changed, 0 insertions, 20 deletions

diff --git a/_test/tests/inc/subscription_set.test.php b/_test/tests/inc/subscription_set.test.php
deleted file mode 100644
index 5c0a6c816..000000000
--- a/_test/tests/inc/subscription_set.test.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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');
-    }
-}