stable

Clone or download

Read-only

Merge commit 'refs/changes/65/3865/7' of ssh://gerrit.tuleap.net:29418/tuleap into HEAD

* ssh://gerrit.tuleap.net:29418/tuleap: story #7883: Redirect from PHPWiki core to the plugin when a project use the plugin Conflicts: src/common/autoload.php Change-Id: Ie62d29a07fb76e0299cdbb89269077e61a172eb0

Modified Files

Name
M plugins/phpwiki/include/phpwikiPlugin.class.php +7 −4 Go to diff View file
M src/common/autoload.php +3 −2 Go to diff View file
A src/common/wiki/PHPWikiPluginRedirector.class.php +26 −0 Go to diff View file
M src/common/wiki/lib/WikiAttachment.class.php +4 −0 Go to diff View file
M src/www/wiki/admin/index.php +3 −3 Go to diff View file
M src/www/wiki/index.php +2 −2 Go to diff View file
M src/www/wiki/uploads +3 −0 Go to diff View file