diff options
| author | Guy Brand <gb@unistra.fr> | 2013-03-06 14:08:08 +0100 |
|---|---|---|
| committer | Guy Brand <gb@unistra.fr> | 2013-03-06 14:08:08 +0100 |
| commit | 23678e344b4ddcad14254c106ecb93af174fdaa0 (patch) | |
| tree | a5c787e4d87313a7fb6f18cb4c78bf210d92d60c /_cs | |
| parent | 847cef0a6bfd2ff9dc54e1fc140f5ba0ece0017a (diff) | |
| parent | 5721a1547938df76003c6d91ea003dc1c70abd94 (diff) | |
| download | rpg-23678e344b4ddcad14254c106ecb93af174fdaa0.tar.gz rpg-23678e344b4ddcad14254c106ecb93af174fdaa0.tar.bz2 | |
Merge branch 'master' into stable
Diffstat (limited to '_cs')
| -rw-r--r-- | _cs/DokuWiki/Sniffs/PHP/DeprecatedFunctionsSniff.php | 1 | ||||
| -rw-r--r-- | _cs/DokuWiki/ruleset.xml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/_cs/DokuWiki/Sniffs/PHP/DeprecatedFunctionsSniff.php b/_cs/DokuWiki/Sniffs/PHP/DeprecatedFunctionsSniff.php index ecd4093b8..c5d14377b 100644 --- a/_cs/DokuWiki/Sniffs/PHP/DeprecatedFunctionsSniff.php +++ b/_cs/DokuWiki/Sniffs/PHP/DeprecatedFunctionsSniff.php @@ -49,6 +49,7 @@ class DokuWiki_Sniffs_PHP_DeprecatedFunctionsSniff extends Generic_Sniffs_PHP_Fo 'search_fulltext' => 'Fulltext Indexer', 'search_regex' => 'Fulltext Indexer', 'tpl_getFavicon' => 'tpl_getMediaFile', + 'p_cached_xhtml' => 'p_cached_output', ); /** diff --git a/_cs/DokuWiki/ruleset.xml b/_cs/DokuWiki/ruleset.xml index bfbef87fe..c69ef853a 100644 --- a/_cs/DokuWiki/ruleset.xml +++ b/_cs/DokuWiki/ruleset.xml @@ -25,7 +25,7 @@ <rule ref="Generic.CodeAnalysis.EmptyStatement" /> <rule ref="Generic.CodeAnalysis.UselessOverridingMethod" /> <rule ref="Generic.Commenting.Todo" /> - <ruke ref="Generic.Files.ByteOrderMark" /> + <rule ref="Generic.Files.ByteOrderMark" /> <rule ref="Generic.Files.LineEndings" /> <rule ref="Generic.Formatting.DisallowMultipleStatements" /> <rule ref="Generic.Metrics.NestingLevel"> |