diff options
author | Michael Hamann <michael@content-space.de> | 2010-10-10 14:26:22 +0200 |
---|---|---|
committer | Michael Hamann <michael@content-space.de> | 2010-10-10 14:26:22 +0200 |
commit | 762b4c44c691f69d521413d7016314e7f547c102 (patch) | |
tree | 95ab294b1df2f8c7a5efb56762a0f284bec3754e /inc/changelog.php | |
parent | eae17177de8f3f3580af5ea66d126aee0f23227f (diff) | |
parent | 4ea48b361401e136dbfd3339af368ceeb5b27480 (diff) | |
download | rpg-762b4c44c691f69d521413d7016314e7f547c102.tar.gz rpg-762b4c44c691f69d521413d7016314e7f547c102.tar.bz2 |
Merge remote branch 'origin/master' into sitemap
Diffstat (limited to 'inc/changelog.php')
-rw-r--r-- | inc/changelog.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/changelog.php b/inc/changelog.php index d5cd8308c..bb00df76c 100644 --- a/inc/changelog.php +++ b/inc/changelog.php @@ -104,7 +104,7 @@ function addLogEntry($date, $id, $type=DOKU_CHANGE_TYPE_EDIT, $summary='', $extr * @author Ben Coburn <btcoburn@silicodon.net> */ function addMediaLogEntry($date, $id, $type=DOKU_CHANGE_TYPE_EDIT, $summary='', $extra='', $flags=null){ - global $conf, $INFO; + global $conf; $id = cleanid($id); |