splitbrain / dokuwiki

inc/Action/Conflict.php

<?php

namespace dokuwiki\Action;

/**
 * Class Conflict
 *
 * Show the conflict resolution screen
 *
 * @package dokuwiki\Action
 */
class Conflict extends AbstractAction {

    /** @inheritdoc */
    function minimumPermission() {

It is generally recommended to explicitly declare the visibility for methods.

        global $INFO;
        if($INFO['exists']) {
            return AUTH_EDIT;
        } else {
            return AUTH_CREATE;
        }
    }

    public function tplContent() {
        global $PRE;
        global $TEXT;
        global $SUF;
        global $SUM;

        html_conflict(con($PRE, $TEXT, $SUF), $SUM);
        html_diff(con($PRE, $TEXT, $SUF), false);
    }

}