diff options
| author | Satoshi Sahara <sahara.satoshi@gmail.com> | 2022-01-28 19:21:15 +0900 |
|---|---|---|
| committer | Satoshi Sahara <sahara.satoshi@gmail.com> | 2022-01-28 19:21:15 +0900 |
| commit | 3712ae9ece92ba7d04a5a39f42b55a84bd64fdef (patch) | |
| tree | 5c12aa447bbbfb70fe3171057df20989c76bb358 /inc/Ui | |
| parent | 2aa019d676e509afc357b0fc10a8badc151425a4 (diff) | |
| download | dokuwiki-3712ae9ece92ba7d04a5a39f42b55a84bd64fdef.tar.gz dokuwiki-3712ae9ece92ba7d04a5a39f42b55a84bd64fdef.zip | |
change var name $rev1Supple to $rev1Summary
Diffstat (limited to 'inc/Ui')
| -rw-r--r-- | inc/Ui/MediaDiff.php | 8 | ||||
| -rw-r--r-- | inc/Ui/PageDiff.php | 14 |
2 files changed, 11 insertions, 11 deletions
diff --git a/inc/Ui/MediaDiff.php b/inc/Ui/MediaDiff.php index 496702ebf..2e78e04a7 100644 --- a/inc/Ui/MediaDiff.php +++ b/inc/Ui/MediaDiff.php @@ -246,11 +246,11 @@ class MediaDiff extends Diff // revision title $rev1Title = trim($Rev1->showRevisionTitle() .' '. $Rev1->showCurrentIndicator()); - $rev1Supple = ($Rev1->val('date')) + $rev1Summary = ($Rev1->val('date')) ? $Rev1->showEditSummary() .' '. $Rev1->showEditor() : ''; $rev2Title = trim($Rev2->showRevisionTitle() .' '. $Rev2->showCurrentIndicator()); - $rev2Supple = ($Rev2->val('date')) + $rev2Summary = ($Rev2->val('date')) ? $Rev2->showEditSummary() .' '. $Rev2->showEditor() : ''; @@ -261,8 +261,8 @@ class MediaDiff extends Diff echo '<div class="table">'; echo '<table>'; echo '<tr>'; - echo '<th>'. $rev1Title .' '. $rev1Supple .'</th>'; - echo '<th>'. $rev2Title .' '. $rev2Supple .'</th>'; + echo '<th>'. $rev1Title .' '. $rev1Summary .'</th>'; + echo '<th>'. $rev2Title .' '. $rev2Summary .'</th>'; echo '</tr>'; echo '<tr class="image">'; diff --git a/inc/Ui/PageDiff.php b/inc/Ui/PageDiff.php index aaa4606a0..81fba3b69 100644 --- a/inc/Ui/PageDiff.php +++ b/inc/Ui/PageDiff.php @@ -185,16 +185,16 @@ class PageDiff extends Diff // revision title $rev1Title = trim($Rev1->showRevisionTitle() .' '. $Rev1->showCurrentIndicator()); - $rev1Supple = ($Rev1->val('date')) + $rev1Summary = ($Rev1->val('date')) ? $Rev1->showEditSummary() .' '. $Rev1->showEditor() : ''; if ($Rev2->val('extra') == 'compareWith') { $rev2Title = $lang['yours']; - $rev2Supple = ''; + $rev2Summary = ''; } else { $rev2Title = trim($Rev2->showRevisionTitle() .' '. $Rev2->showCurrentIndicator()); - $rev2Supple = ($Rev2->val('date')) + $rev2Summary = ($Rev2->val('date')) ? $Rev2->showEditSummary() .' '. $Rev2->showEditor() : ''; } @@ -226,8 +226,8 @@ class PageDiff extends Diff //navigation and header switch ($this->preference['difftype']) { case 'inline': - $title1 = $rev1Title . ($rev1Supple ? '<br />'.$rev1Supple : ''); - $title2 = $rev2Title . ($rev2Supple ? '<br />'.$rev2Supple : ''); + $title1 = $rev1Title . ($rev1Summary ? '<br />'.$rev1Summary : ''); + $title2 = $rev2Title . ($rev2Summary ? '<br />'.$rev2Summary : ''); // no navigation for PageConflict or PageDraft if ($Rev2->val('extra') !== 'compareWith') { echo '<tr>' @@ -253,8 +253,8 @@ class PageDiff extends Diff case 'sidebyside': default: - $title1 = $rev1Title . ($rev1Supple ? ' '.$rev1Supple : ''); - $title2 = $rev2Title . ($rev2Supple ? ' '.$rev2Supple : ''); + $title1 = $rev1Title . ($rev1Summary ? ' '.$rev1Summary : ''); + $title2 = $rev2Title . ($rev2Summary ? ' '.$rev2Summary : ''); // no navigation for PageConflict or PageDraft if ($Rev2->val('extra') !== 'compareWith') { echo '<tr>' |