commit 489733fdc2c526a1ad9a7b7f27847d7dbdd78875
parent 4a2e71d23f05d22e554b32bea84dd83ae1de5515
Author: Jan Dankert <devnull@localhost>
Date: Mon, 14 Jan 2019 22:07:33 +0100
Fix: Bei Verlaufsanzeige den Publisher mitliefern.
Diffstat:
3 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/modules/cms-core/action/PageelementAction.class.php b/modules/cms-core/action/PageelementAction.class.php
@@ -798,7 +798,7 @@ class PageelementAction extends Action
$this->page->load();
$this->value->page = &$this->page;
- $this->value->simple = true;
+ $this->value->publisher = $this->page->publisher;
$this->value->languageid = $this->page->languageid;
$this->value->objectid = $this->page->objectid;
$this->value->pageid = Page::getPageIdFromObjectId( $this->page->objectid );
@@ -814,7 +814,7 @@ class PageelementAction extends Action
$lfd_nr++;
$value->element = &$this->element;
$value->page = &$this->page;
- $value->simple = true;
+ $value->publisher = &$this->page->publisher;
$value->generate();
diff --git a/modules/cms-ui/themes/default/html/views/pageelement/diff.php b/modules/cms-ui/themes/default/html/views/pageelement/diff.php
@@ -5,9 +5,9 @@
<td>
</td>
<td>
- <em class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_COMPARE')))); ?></em>
+ <em><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_COMPARE')))); ?></em>
- <span class="text"><?php echo nl2br(' '); ?></span>
+ <span><?php echo nl2br(' '); ?></span>
<?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($date_left) ?>
@@ -15,9 +15,9 @@
<td>
</td>
<td>
- <em class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_WITH')))); ?></em>
+ <em><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_WITH')))); ?></em>
- <span class="text"><?php echo nl2br(' '); ?></span>
+ <span><?php echo nl2br(' '); ?></span>
<?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($date_right) ?>
@@ -31,33 +31,33 @@
<tr class="diff">
<?php $if5=(isset($left)); if($if5){?>
<td width="5%" class="line">
- <tt class="text"><?php echo nl2br(encodeHtml(htmlentities(@$left[line]))); ?></tt>
+ <tt><?php echo nl2br(encodeHtml(htmlentities(@$left[line]))); ?></tt>
</td>
<td width="45%" class="<?php echo @$left[type] ?>">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(@$left[text]))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(@$left[text]))); ?></span>
</td>
<?php } ?>
<?php if(!$if5){?>
<td width="50%" colspan="2" class="help">
- <span class="text"><?php echo nl2br(' '); ?></span>
+ <span><?php echo nl2br(' '); ?></span>
</td>
<?php } ?>
<?php $if5=(isset($right)); if($if5){?>
<td width="5%" class="line">
- <tt class="text"><?php echo nl2br(encodeHtml(htmlentities(@$right[line]))); ?></tt>
+ <tt><?php echo nl2br(encodeHtml(htmlentities(@$right[line]))); ?></tt>
</td>
<td width="45%" class="<?php echo @$right[type] ?>">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(@$right[text]))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(@$right[text]))); ?></span>
</td>
<?php } ?>
<?php if(!$if5){?>
<td width="50%" colspan="2" class="help">
- <span class="text"><?php echo nl2br(' '); ?></span>
+ <span><?php echo nl2br(' '); ?></span>
</td>
<?php } ?>
diff --git a/modules/cms-ui/themes/default/html/views/pageelement/history.php b/modules/cms-ui/themes/default/html/views/pageelement/history.php
@@ -4,44 +4,44 @@
<div class="table-wrapper"><div class="table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><table width="100%"></div>
<tr class="headline">
<td class="help">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NR')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NR')))); ?></span>
</td>
<td colspan="2" class="help">
<?php $if6=(isset($compareid)); if($if6){?>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_COMPARE')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_COMPARE')))); ?></span>
<?php } ?>
<?php if(!$if6){?>
- <span class="text"><?php echo nl2br(' '); ?></span>
+ <span><?php echo nl2br(' '); ?></span>
<?php } ?>
</td>
<td class="help">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('DATE')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('DATE')))); ?></span>
</td>
<td class="help">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_USER')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_USER')))); ?></span>
</td>
<td class="help">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_VALUE')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_VALUE')))); ?></span>
</td>
<td class="help">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_STATE')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_STATE')))); ?></span>
</td>
<td class="help">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_ACTION')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_ACTION')))); ?></span>
</td>
</tr>
<?php $if4=(($el)==FALSE); if($if4){?>
<tr>
<td colspan="8">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NOT_FOUND')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NOT_FOUND')))); ?></span>
</td>
</tr>
@@ -49,7 +49,7 @@
<?php foreach($el as $list_key=>$list_value){ ?><?php extract($list_value) ?>
<tr class="data">
<td>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities($lfd_nr))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities($lfd_nr))); ?></span>
</td>
<td>
@@ -58,7 +58,7 @@
<?php } ?>
<?php if(!$if7){?>
- <span class="text"><?php echo nl2br(' '); ?></span>
+ <span><?php echo nl2br(' '); ?></span>
<?php } ?>
</td>
@@ -68,7 +68,7 @@
<?php } ?>
<?php if(!$if7){?>
- <span class="text"><?php echo nl2br(' '); ?></span>
+ <span><?php echo nl2br(' '); ?></span>
<?php } ?>
</td>
@@ -77,16 +77,16 @@
</td>
<td>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities($user))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities($user))); ?></span>
</td>
<td>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities($value))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities($value))); ?></span>
</td>
<?php $if6=($public); if($if6){?>
<td>
- <strong class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_PUBLIC'.'')))); ?></strong>
+ <strong><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_PUBLIC'.'')))); ?></strong>
</td>
<?php } ?>
@@ -94,7 +94,7 @@
<?php $if7=(isset($releaseUrl)); if($if7){?>
<td class="clickable">
<a title="<?php echo lang('GLOBAL_RELEASE_DESC') ?>" target="_self" data-type="post" data-action="" data-method="release" data-id="<?php echo $objectid ?>" data-extra="{'valueid':'<?php echo $valueid ?>'}" data-data="{"action":"pageelement","subaction":"release","id":"<?php echo $objectid ?>","token":"<?php echo token() ?>","valueid":"<?php echo $valueid ?>","none":"0"}">
- <strong class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_RELEASE'.'')))); ?></strong>
+ <strong><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_RELEASE'.'')))); ?></strong>
</a>
@@ -102,14 +102,14 @@
<?php } ?>
<?php if(!$if7){?>
<td>
- <em class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_INACTIVE'.'')))); ?></em>
+ <em><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_INACTIVE'.'')))); ?></em>
</td>
<?php } ?>
<?php } ?>
<?php $if6=($active); if($if6){?>
<td>
- <em class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_ACTIVE'.'')))); ?></em>
+ <em><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_ACTIVE'.'')))); ?></em>
</td>
<?php } ?>
@@ -117,7 +117,7 @@
<?php $if7=(isset($useUrl)); if($if7){?>
<td class="clickable">
<a title="<?php echo lang('GLOBAL_USE_DESC') ?>" target="_self" data-type="post" data-action="" data-method="use" data-id="<?php echo $objectid ?>" data-extra="{'valueid':'<?php echo $valueid ?>'}" data-data="{"action":"pageelement","subaction":"use","id":"<?php echo $objectid ?>","token":"<?php echo token() ?>","valueid":"<?php echo $valueid ?>","none":"0"}">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_USE'.'')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_USE'.'')))); ?></span>
</a>
