diff options
| author | Adrian Lang <mail@adrianlang.de> | 2010-10-07 09:44:02 +0200 |
|---|---|---|
| committer | Adrian Lang <mail@adrianlang.de> | 2010-10-07 09:44:02 +0200 |
| commit | d9c8ae6b7379d7b64d4817dbd5cca276b45a9dd5 (patch) | |
| tree | 39c26d5412170ca4fa176962e60e9962dc643667 /inc/SimplePie.php | |
| parent | 2c053ed58376c6709596ab48fc40dceb90d4e89d (diff) | |
| parent | 85dd53ceb1c2d9a7abe01b5ec50d155dcb142c59 (diff) | |
| download | rpg-d9c8ae6b7379d7b64d4817dbd5cca276b45a9dd5.tar.gz rpg-d9c8ae6b7379d7b64d4817dbd5cca276b45a9dd5.tar.bz2 | |
Merge branch 'master' into stable
Diffstat (limited to 'inc/SimplePie.php')
| -rw-r--r-- | inc/SimplePie.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/SimplePie.php b/inc/SimplePie.php index 276a654ee..99c9f3226 100644 --- a/inc/SimplePie.php +++ b/inc/SimplePie.php @@ -9120,7 +9120,7 @@ class SimplePie_Misc } else { - trigger_error('Unknown class passed as parameter', E_USER_WARNNG); + trigger_error('Unknown class passed as parameter', E_USER_WARNING); } } return false; |