Merge branch 'master' into htmlmail

* master: (382 commits)
  Romanian language update
  Marathi language update
  Arabic Language Update
  when there's not enough space for images, make sure they stay proportional (might be FS#2480)
  added minimal RTL print styles (part of FS#2185)
  moved plugins' rtl.css to their style.css counterpart (part of FS#2185)
  removed all browser-specific gradients as the recently (in 42ff6730) introduced svg makes them unnecessary
  removed comments from accidentally commented lines in tpl_includeFile()
  removed obsolete template file
  added tpl_includeFile() to core
  Make getTitle method in remote interface public
  Changed an error code in XML-RPC interface. This error hasn't anything to do with the rest of the -32600 errors.
  BG: language update
  Korean language update
  fixed performance issues with gradient in Firefox (which also added gradient support for IE9) (FS#2447)
  deleted very old (and unused) images
  added accidentally removed '<?php' back in (was in 57fc5edd)
  wrapped X-UA-Compatible meta tag with conditional comments
  added explanation to todo in _forms.css
  removed problematic 'overflow: hidden' from lists again ('unfixes' FS#1950)
  ...

Conflicts:
	inc/auth.php
	inc/load.php

1 files changed, 0 insertions, 78 deletions

diff --git a/_cs/DokuWiki/DokuWikiCodingStandard.php b/_cs/DokuWiki/DokuWikiCodingStandard.php
deleted file mode 100644
index 36133fc46..000000000
--- a/_cs/DokuWiki/DokuWikiCodingStandard.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * DokuWiki Coding Standard.
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Andreas Gohr <andi@splitbrain.org>
- */
-
-if (class_exists('PHP_CodeSniffer_Standards_CodingStandard', true) === false) {
-    throw new PHP_CodeSniffer_Exception('Class PHP_CodeSniffer_Standards_CodingStandard not found');
-}
-
-/**
- * DokuWiki Coding Standard.
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Andreas Gohr <andi@splitbrain.org>
- */
-class PHP_CodeSniffer_Standards_DokuWiki_DokuWikiCodingStandard extends PHP_CodeSniffer_Standards_CodingStandard {
-
-
-    /**
-     * Return a list of external sniffs to include with this standard.
-     *
-     * @return array
-     */
-    public function getIncludedSniffs() {
-        return array(
-            'Generic/Sniffs/Classes/DuplicateClassNameSniff.php',
-            'Generic/Sniffs/CodeAnalysis/JumbledIncrementerSniff.php',
-            'Generic/Sniffs/CodeAnalysis/UnnecessaryFinalModifierSniff.php',
-            'Generic/Sniffs/CodeAnalysis/UnconditionalIfStatementSniff.php',
-            'Generic/Sniffs/CodeAnalysis/ForLoopShouldBeWhileLoopSniff.php',
-            'Generic/Sniffs/CodeAnalysis/ForLoopWithTestFunctionCallSniff.php',
-            'Generic/Sniffs/CodeAnalysis/UnusedFunctionParameterSniff.php',
-            'Generic/Sniffs/CodeAnalysis/EmptyStatementSniff.php',
-            'Generic/Sniffs/CodeAnalysis/UselessOverridingMethodSniff.php',
-            'Generic/Sniffs/Commenting/TodoSniff.php',
-            'Generic/Sniffs/Files/LineEndingsSniff.php',
-            'Generic/Sniffs/Formatting/DisallowMultipleStatementsSniff.php',
-            'Generic/Sniffs/Metrics/NestingLevelSniff.php',
-//            'Generic/Sniffs/Metrics/CyclomaticComplexitySniff.php', //FIXME we might need to tune this first
-            'Generic/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php',
-            'Generic/Sniffs/PHP/LowerCaseConstantSniff.php',
-            'Generic/Sniffs/PHP/DisallowShortOpenTagSniff.php',
-            'Generic/Sniffs/PHP/ForbiddenFunctionsSniff.php',
-            'Generic/Sniffs/WhiteSpace/DisallowTabIndentSniff.php',
-            'DokuWiki/Sniffs/WhiteSpace/ScopeIndentSniff.php',
-            'Zend/Sniffs/Files/ClosingTagSniff.php',
-            'PEAR/Sniffs/Functions/ValidDefaultValueSniff.php',
-            'Squiz/Sniffs/PHP/EvalSniff.php',
-            'Squiz/Sniffs/PHP/NonExecutableCodeSniff.php',
-//            'Squiz/Sniffs/PHP/CommentedOutCodeSniff.php', //FIXME should ignore oneliners
-            'Squiz/Sniffs/WhiteSpace/SuperfluousWhitespaceSniff.php',
-            'Squiz/Sniffs/PHP/NonExecutableCodeSniff.php',
-            'Squiz/Sniffs/CSS/LowercaseStyleDefinitionSniff.php',
-            'Squiz/Sniffs/CSS/MissingColonSniff.php',
-            'Squiz/Sniffs/CSS/DisallowMultipleStyleDefinitionsSniff.php',
-            'Squiz/Sniffs/CSS/ColonSpacingSniff.php',
-            'Squiz/Sniffs/CSS/ClassDefinitionClosingBraceSpaceSniff.php',
-            'Squiz/Sniffs/CSS/SemicolonSpacingSniff.php',
-            'Squiz/Sniffs/CSS/IndentationSniff.php',
-            'Squiz/Sniffs/CSS/EmptyClassDefinitionSniff.php',
-            'Squiz/Sniffs/CSS/ClassDefinitionNameSpacingSniff.php',
-            'Squiz/Sniffs/CSS/EmptyStyleDefinitionSniff.php',
-            'Squiz/Sniffs/CSS/OpacitySniff.php',
-            'Squiz/Sniffs/CSS/ColourDefinitionSniff.php',
-            'Squiz/Sniffs/CSS/DuplicateClassDefinitionSniff.php',
-            'Squiz/Sniffs/CSS/ClassDefinitionOpeningBraceSpaceSniff.php',
-
-            'Squiz/Sniffs/Commenting/DocCommentAlignmentSniff.php',
-
-        );
-    }
-
-}//end class