commit 830d9fb9f7bc30b499099b5490f03816450972cc parent b1305cae99bb7ab1bfd389af0a3889a0d7c4f2c0 Author: Jan Dankert <devnull@localhost> Date: Sat, 15 Dec 2018 23:49:08 +0100 Fix: Speichern Einfüge-Element funktioniert jetzt. Diffstat:
4 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/modules/cms-core/action/PageelementAction.class.php b/modules/cms-core/action/PageelementAction.class.php @@ -1268,6 +1268,7 @@ class PageelementAction extends Action private function saveinsert() { $value = new Value(); + $value->publisher = $this->page->publisher; $value->languageid = $this->page->languageid; $value->objectid = $this->page->objectid; $value->pageid = Page::getPageIdFromObjectId( $this->page->objectid ); diff --git a/modules/cms-core/model/Page.class.php b/modules/cms-core/model/Page.class.php @@ -114,11 +114,9 @@ class Page extends BaseObject * @deprecated pageid sollte nicht mehr benutzt werden * @return Integer pageid */ - function getPageIdFromObjectId( $objectid ) + public static function getPageIdFromObjectId( $objectid ) { - $db = db_connection(); - - $sql = $db->sql( 'SELECT id FROM {{page}} '. + $sql = db()->sql( 'SELECT id FROM {{page}} '. ' WHERE objectid={objectid}' ); $sql->setInt('objectid',$objectid); diff --git a/modules/cms-ui/themes/default/html/views/pageelement/edit.php b/modules/cms-ui/themes/default/html/views/pageelement/edit.php @@ -157,7 +157,7 @@ </div> <?php } ?> <?php $if5=($editor=='markdown'); if($if5){?> - <textarea name="<?php if ('') echo ''.'_' ?>text<?php if ('') echo '_disabled' ?>" class="editor markdown-editor"><?php echo ${'text'} ?></textarea> + <textarea name="<?php if ('') echo ''.'_' ?>text<?php if ('') echo '_disabled' ?>" class="editor markdown-editor"><?php echo htmlentities(${'text'}) ?></textarea> <?php } ?> <?php $if5=($editor=='html'); if($if5){?> diff --git a/modules/cms-ui/themes/default/html/views/template/prop.php b/modules/cms-ui/themes/default/html/views/template/prop.php @@ -5,11 +5,11 @@ <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="template" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form template" data-async="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="template" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="prop" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> <div class="line"> <div class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('TEMPLATE_NAME')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('TEMPLATE_NAME')))); ?></span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="name<?php if ('') echo '_disabled' ?>" type="text" maxlength="50" class="text" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if ('') { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> + <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if ('') echo '_disabled' ?>" type="text" maxlength="50" class="" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if ('') { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> </div> </div> @@ -17,20 +17,20 @@ </div></fieldset> <div class="line"> <div class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'file_extension'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'file_extension'.'')))); ?></span> </div> <div class="input"> <a target="_self" data-type="view" data-action="" data-method="extension" data-id="<?php echo OR_ID ?>" data-extra="[]" href="<?php echo Html::url('','extension','',array()) ?>"> <div class="inputholder"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities($extension))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities($extension))); ?></span> </div> </a> <div class="clickable"> <a class="action" target="_self" data-type="view" data-action="" data-method="extension" data-id="<?php echo OR_ID ?>" data-extra="[]" href="<?php echo Html::url('','extension','',array()) ?>"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'edit'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'edit'.'')))); ?></span> </a> @@ -39,13 +39,13 @@ </div> <div class="line"> <div class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'file_mimetype'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'file_mimetype'.'')))); ?></span> </div> <div class="input"> <a target="_self" data-action="template" data-method="extension" data-id="<?php echo OR_ID ?>" data-extra="[]" href="<?php echo Html::url('template','extension','',array()) ?>"> <div class="inputholder"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities($mime_type))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities($mime_type))); ?></span> </div> </a>