stable

Clone or download

Read-only

Merge commit 'refs/changes/19/4419/5' of ssh://gerrit.tuleap.net:29418/tuleap into HEAD

* ssh://gerrit.tuleap.net:29418/tuleap: story #7883: PHPWiki plugin works with Docman Change-Id: Ia1913a51e671449476213bcab0e6fba9862af75b

Modified Files

Name
M plugins/docman/include/Docman_ItemFactory.class.php +44 −48 Go to diff View file
M plugins/docman/include/Docman_WikiController.class.php +5 −7 Go to diff View file
M plugins/docman/include/constants.php +12 −1 Go to diff View file
M plugins/docman/include/view/Docman_View_ItemDetailsSectionApproval.class.php +8 −1 Go to diff View file
M plugins/docman/include/view/Docman_View_NewDocument.class.php +1 −1 Go to diff View file
M plugins/docman/include/view/Docman_View_Redirect.class.php +7 −1 Go to diff View file
M plugins/phpwiki/include/lib/PHPWikiPage.class.php +33 −1 Go to diff View file
M plugins/phpwiki/include/phpwikiPlugin.class.php +17 −0 Go to diff View file
M src/common/wiki/lib/WikiPage.class.php +33 −1 Go to diff View file