jQuery rewrite branch merged into master branch of whole project

1 files changed, 9 insertions, 5 deletions

diff --git a/inc/config_cascade.php b/inc/config_cascade.php
index 3ae68a000..48ed5a000 100644
--- a/inc/config_cascade.php
+++ b/inc/config_cascade.php
@@ -5,7 +5,8 @@
  * This array configures the default locations of various files in the
  * DokuWiki directory hierarchy. It can be overriden in inc/preload.php
  */
-$config_cascade = array(
+$config_cascade = array_merge(
+    array(
         'main' => array(
             'default'   => array(DOKU_CONF.'dokuwiki.php'),
             'local'     => array(DOKU_CONF.'local.php'),
@@ -48,10 +49,11 @@ $config_cascade = array(
             'local'     => array(DOKU_CONF.'wordblock.local.conf'),
             ),
         'userstyle' => array(
-            'default' => DOKU_CONF.'userstyle.css',
-            'print'   => DOKU_CONF.'printstyle.css',
-            'feed'    => DOKU_CONF.'feedstyle.css',
-            'all'     => DOKU_CONF.'allstyle.css',
+            'screen'  => DOKU_CONF.'userstyle.css',
+            'rtl'     => DOKU_CONF.'userrtl.css',
+            'print'   => DOKU_CONF.'userprint.css',
+            'feed'    => DOKU_CONF.'userfeed.css',
+            'all'     => DOKU_CONF.'userall.css',
             ),
         'userscript' => array(
             'default' => DOKU_CONF.'userscript.js'
@@ -62,5 +64,7 @@ $config_cascade = array(
         'plainauth.users' => array(
             'default' => DOKU_CONF.'users.auth.php',
             ),
+        ),
+        $config_cascade
 );