diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2012-07-06 11:07:34 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2012-07-06 11:07:34 +0200 |
| commit | 29f2dfdcb84bbfd8394b14e2e79809828e923247 (patch) | |
| tree | f573b232a06346d2d1b41910bb8f7e34fe518397 /lib/exe/css.php | |
| parent | 14e2b802ac28e91a3e1f468396950ed5b318109d (diff) | |
| parent | 36d61a2c62ee2c4198229406af6aa91b14bf6125 (diff) | |
| download | rpg-29f2dfdcb84bbfd8394b14e2e79809828e923247.tar.gz rpg-29f2dfdcb84bbfd8394b14e2e79809828e923247.tar.bz2 | |
Merge branch 'input-validation' of git://github.com/whoopdedo/dokuwiki into pull-request-110
* 'input-validation' of git://github.com/whoopdedo/dokuwiki:
fix incorrect usage of tpl_getMediaFile
fix necessary global declaration
Input wrapper for html forms
Input validation for media manager
Input wrapper for exe scripts
more INPUT wrapper uses: cache purge, sectok, getID
Input wrapper for action.php
Conflicts:
lib/exe/css.php
Diffstat (limited to 'lib/exe/css.php')
| -rw-r--r-- | lib/exe/css.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/exe/css.php b/lib/exe/css.php index 1b2b0c86b..8de3db11b 100644 --- a/lib/exe/css.php +++ b/lib/exe/css.php @@ -30,8 +30,9 @@ function css_out(){ global $conf; global $lang; global $config_cascade; + global $INPUT; - if (isset($_REQUEST['s']) && ($_REQUEST['s'] == 'feed')) { + if ($INPUT->str('s') == 'feed') { $mediatypes = array('feed'); $type = 'feed'; } else { @@ -39,7 +40,7 @@ function css_out(){ $type = ''; } - $tpl = trim(preg_replace('/[^\w-]+/','',$_REQUEST['t'])); + $tpl = trim(preg_replace('/[^\w-]+/','',$INPUT->str('t'))); if($tpl){ $tplinc = DOKU_INC.'lib/tpl/'.$tpl.'/'; $tpldir = DOKU_BASE.'lib/tpl/'.$tpl.'/'; |