@@ -301,6 +301,10 @@ discard block |
||
| 301 | 301 | * @param boolean $is_image TRUE if this is an image |
| 302 | 302 | * @return string The string with the evil attributes removed |
| 303 | 303 | */ |
| 304 | + |
|
| 305 | + /** |
|
| 306 | + * @param boolean $evilAttribute |
|
| 307 | + */ |
|
| 304 | 308 | protected function _remove_evil_attributes($str, $is_image, $evilAttribute) |
| 305 | 309 | { |
| 306 | 310 | // All javascript event handlers (e.g. onload, onclick, onmouseover), style, and xmlns |
@@ -429,7 +433,7 @@ discard block |
||
| 429 | 433 | * things like j a v a s c r i p t |
| 430 | 434 | * |
| 431 | 435 | * @param type |
| 432 | - * @return type |
|
| 436 | + * @return string |
|
| 433 | 437 | */ |
| 434 | 438 | protected function _compact_exploded_words($matches) |
| 435 | 439 | { |
@@ -171,8 +171,7 @@ discard block |
||
| 171 | 171 | // closing tags every so often so we skip those and only |
| 172 | 172 | // do the long opening tags. |
| 173 | 173 | $str = preg_replace('/<\?(php)/i', "<?\\1", $str); |
| 174 | - } |
|
| 175 | - else |
|
| 174 | + } else |
|
| 176 | 175 | { |
| 177 | 176 | $str = str_replace(array('<?', '?' . '>'), array('<?', '?>'), $str); |
| 178 | 177 | } |
@@ -307,8 +306,7 @@ discard block |
||
| 307 | 306 | if ($evilAttribute) |
| 308 | 307 | { |
| 309 | 308 | $evil_attributes = array('on\w*', 'style', 'xmlns'); |
| 310 | - } |
|
| 311 | - else |
|
| 309 | + } else |
|
| 312 | 310 | { |
| 313 | 311 | $evil_attributes = array('on\w*', 'xmlns'); |
| 314 | 312 | } |