Merge branch 'master' into stable

* master: (413 commits)
  release preparation
  fixed strict violation in ACL plugin
  Fix issues from teams:i18n:translation-check in localizations
  ensure locale is set back to the original value
  skip FS#2867 test if \s doesn't match \xA0 after attempting to change the locale
  unittests for auth_loadACL
  translation update
  allow charset for SSO to be configured FS#2148
  Mailer: avoid overlong headers in content ids FS#2868
  translation update
  translation update
  replace \s, \S with [ \t], [^ \t] in regexs used with acls
  translation update
  translation update
  translation update
  translation update
  Fix handling of the legacy subscription action name
  remove obsolete opera handling and session closing
  remove no longer used ajax.php
  fix proxy CONNECT where HTTP 1.1 answer is given
  ...

3 files changed, 7 insertions, 7 deletions

diff --git a/bin/dwpage.php b/bin/dwpage.php
index bc9c0f6bb..96f6d3ef9 100755
--- a/bin/dwpage.php
+++ b/bin/dwpage.php
@@ -13,7 +13,7 @@ require_once DOKU_INC.'inc/cliopts.php';
 function usage($action) {
     switch ( $action ) {
         case 'checkout':
-           print "Usage: dwpage.php [opts] checkout <wiki:page> [working_file]
+            print "Usage: dwpage.php [opts] checkout <wiki:page> [working_file]
 
     Checks out a file from the repository, using the wiki id and obtaining
     a lock for the page.
@@ -30,7 +30,7 @@ function usage($action) {
 ";
         break;
         case 'commit':
-           print "Usage: dwpage.php [opts] -m \"Msg\" commit <working_file> <wiki:page>
+            print "Usage: dwpage.php [opts] -m \"Msg\" commit <working_file> <wiki:page>
 
     Checks in the working_file into the repository using the specified
     wiki id, archiving the previous version.
@@ -46,7 +46,7 @@ function usage($action) {
 ";
         break;
         case 'lock':
-           print "Usage: dwpage.php [opts] lock <wiki:page>
+            print "Usage: dwpage.php [opts] lock <wiki:page>
 
     Obtains or updates a lock for a wiki page
 
@@ -59,7 +59,7 @@ function usage($action) {
 ";
         break;
         case 'unlock':
-           print "Usage: dwpage.php [opts] unlock <wiki:page>
+            print "Usage: dwpage.php [opts] unlock <wiki:page>
 
     Removes a lock for a wiki page.
 
diff --git a/bin/striplangs.php b/bin/striplangs.php
index 40cef5063..ac95626c9 100755
--- a/bin/striplangs.php
+++ b/bin/striplangs.php
@@ -127,7 +127,7 @@ if ( $OPTS->has('k') or $OPTS->has('keep') ) {
 
     // ! always enforce 'en' lang when using '--keep' (DW relies on it)
     if ( !isset($langs['en']) ) {
-      $langs[]='en';
+        $langs[]='en';
     }
 } elseif ( $OPTS->has('e') or $OPTS->has('english') ) {
     // '--english' was specified strip everything besides 'en'
diff --git a/bin/wantedpages.php b/bin/wantedpages.php
index 30171fc15..afcb6b271 100755
--- a/bin/wantedpages.php
+++ b/bin/wantedpages.php
@@ -49,7 +49,7 @@ function dw_dir_filter($entry, $basepath) {
 
 #------------------------------------------------------------------------------
 function dw_get_pages($dir) {
-    static $trunclen = NULL;
+    static $trunclen = null;
     if ( !$trunclen ) {
         global $conf;
         $trunclen = strlen($conf['datadir'].':');
@@ -92,7 +92,7 @@ function dw_internal_links($page) {
             $mid = $ins[1][0];
             resolve_pageid($cns,$mid,$exists);
             if ( !$exists ) {
-								list($mid) = explode('#',$mid); //record pages without hashs
+                list($mid) = explode('#',$mid); //record pages without hashs
                 $links[] = $mid;
             }
         }