commit 190378458edeed0b4bfcebc02121671a20562650 parent d1eaa3c7e0055aec30d65a15f086898a14c30ce3 Author: Jan Dankert <devnull@localhost> Date: Sun, 2 Dec 2018 02:12:44 +0100 Fix: Den Publisher korrekt setzen. Diffstat:
4 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/modules/cms-core/action/PageelementAction.class.php b/modules/cms-core/action/PageelementAction.class.php @@ -222,7 +222,7 @@ class PageelementAction extends Action $this->value->pageid = $this->page->pageid; $this->value->element = &$this->element; $this->value->element->load(); - $this->value->publisher = false; + $this->value->publish = false; if ( intval($this->value->valueid)!=0 ) $this->value->loadWithId(); diff --git a/modules/cms-ui/themes/default/html/views/pageelement/edit.php b/modules/cms-ui/themes/default/html/views/pageelement/edit.php @@ -19,7 +19,7 @@ <tr> <td colspan="8" class="help"> <a target="_self" data-url="<?php echo $lastmonthurl ?>" data-action="" data-method="edit" data-id="<?php echo OR_ID ?>" data-extra="[]" href="<?php echo Html::url('','','',array()) ?>"> - <img class="" title="" src="./modules/cms-ui/themes/default/images/icon/left.png" /> + <imgsrc="./modules/cms-ui/themes/default/images/icon/left.png" /> </a> @@ -30,14 +30,14 @@ <span><?php echo nl2br(' '); ?></span> <a target="_self" data-url="<?php echo $nextmonthurl ?>" data-action="" data-method="edit" data-id="<?php echo OR_ID ?>" data-extra="[]" href="<?php echo Html::url('','','',array()) ?>"> - <img class="" title="" src="./modules/cms-ui/themes/default/images/icon/right.png" /> + <imgsrc="./modules/cms-ui/themes/default/images/icon/right.png" /> </a> <span><?php echo nl2br(' '); ?></span> <a target="_self" data-url="<?php echo $lastyearurl ?>" data-action="" data-method="edit" data-id="<?php echo OR_ID ?>" data-extra="[]" href="<?php echo Html::url('','','',array()) ?>"> - <img class="" title="" src="./modules/cms-ui/themes/default/images/icon/left.png" /> + <imgsrc="./modules/cms-ui/themes/default/images/icon/left.png" /> </a> @@ -48,7 +48,7 @@ <span><?php echo nl2br(' '); ?></span> <a target="_self" data-url="<?php echo $nextyearurl ?>" data-action="" data-method="edit" data-id="<?php echo OR_ID ?>" data-extra="[]" href="<?php echo Html::url('','','',array()) ?>"> - <img class="" title="" src="./modules/cms-ui/themes/default/images/icon/right.png" /> + <imgsrc="./modules/cms-ui/themes/default/images/icon/right.png" /> </a> diff --git a/modules/cms-ui/themes/default/html/views/pageelement/info.php b/modules/cms-ui/themes/default/html/views/pageelement/info.php @@ -27,7 +27,7 @@ </td> <td class="filename"> - <img class="image-icon image-icon--element" title="" src="./modules/cms-ui/themes/default/images/icon/element/<?php echo $element_type ?>.svg" /> + <i class="image-icon image-icon--element-var:element_type"></i> <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'el_'.$element_type.''.'')))); ?></span> @@ -39,7 +39,7 @@ </td> <td data-name="<?php echo $template_name ?>" data-action="template" data-id="<?php echo $template_id ?>" class="clickable"> - <img class="" title="" src="./modules/cms-ui/themes/default/images/icon/icon_template.png" /> + <imgsrc="./modules/cms-ui/themes/default/images/icon/icon_template.png" /> <span><?php echo nl2br(encodeHtml(htmlentities($template_name))); ?></span> @@ -51,7 +51,7 @@ </td> <td data-name="<?php echo $element_name ?>" data-action="element" data-id="<?php echo $element_id ?>" class="clickable"> - <img class="" title="" src="./modules/cms-ui/themes/default/images/icon_<?php echo $element_type ?>.png" /> + <imgsrc="./modules/cms-ui/themes/default/images/icon_<?php echo $element_type ?>.png" /> <span><?php echo nl2br(encodeHtml(htmlentities($element_name))); ?></span> @@ -63,13 +63,13 @@ </td> <td> - <img class="" title="" src="./modules/cms-ui/themes/default/images/icon/el_date.png" /> + <imgsrc="./modules/cms-ui/themes/default/images/icon/el_date.png" /> <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($lastchange_date) ?> <span><?php echo nl2br(', '); ?></span> - <img class="" title="" src="./modules/cms-ui/themes/default/images/icon/user.png" /> + <imgsrc="./modules/cms-ui/themes/default/images/icon/user.png" /> <?php include_once( 'modules/template-engine/components/html/user/component-user.php') ?><?php component_user($lastchange_user) ?> diff --git a/modules/util/Tree.class.php b/modules/util/Tree.class.php @@ -375,6 +375,7 @@ class Tree $value->pageid = $page->pageid; $value->element = $element; $value->languageid = $page->languageid; + $value->publisher = new \cms\publish\PublishPreview(); $value->load(); $treeElement->internalId = $value->valueid; }