Skip to content

Commit

Permalink
https://github.com/opencart/opencart/issues/2496
Browse files Browse the repository at this point in the history
  • Loading branch information
danielkerr committed Dec 17, 2014
1 parent 8275db3 commit 9add29b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
16 changes: 8 additions & 8 deletions upload/admin/controller/setting/store.php
Original file line number Diff line number Diff line change
Expand Up @@ -534,20 +534,20 @@ public function getForm() {

$data['placeholder'] = $this->model_tool_image->resize('no_image.png', 100, 100);

if (isset($this->request->post['open'])) {
$data['open'] = $this->request->post['open'];
if (isset($this->request->post['config_open'])) {
$data['config_open'] = $this->request->post['config_open'];
} elseif (isset($store_info['config_open'])) {
$data['open'] = $store_info['open'];
$data['config_open'] = $store_info['config_open'];
} else {
$data['open'] = '';
$data['config_open'] = '';
}

if (isset($this->request->post['comment'])) {
$data['comment'] = $this->request->post['comment'];
if (isset($this->request->post['config_comment'])) {
$data['config_comment'] = $this->request->post['config_comment'];
} elseif (isset($store_info['config_comment'])) {
$data['comment'] = $store_info['comment'];
$data['config_comment'] = $store_info['config_comment'];
} else {
$data['comment'] = '';
$data['config_comment'] = '';
}

$this->load->model('localisation/location');
Expand Down
4 changes: 2 additions & 2 deletions upload/admin/view/template/setting/store_form.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -121,13 +121,13 @@
<div class="form-group">
<label class="col-sm-2 control-label" for="input-open"><span data-toggle="tooltip" title="<?php echo $help_open; ?>"><?php echo $entry_open; ?></span></label>
<div class="col-sm-10">
<textarea name="open" rows="5" placeholder="<?php echo $entry_open; ?>" id="input-open" class="form-control"><?php echo $open; ?></textarea>
<textarea name="config_open" rows="5" placeholder="<?php echo $entry_open; ?>" id="input-open" class="form-control"><?php echo $config_open; ?></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label" for="input-comment"><span data-toggle="tooltip" title="<?php echo $help_comment; ?>"><?php echo $entry_comment; ?></span></label>
<div class="col-sm-10">
<textarea name="comment" rows="5" placeholder="<?php echo $entry_comment; ?>" id="input-comment" class="form-control"><?php echo $comment; ?></textarea>
<textarea name="config_comment" rows="5" placeholder="<?php echo $entry_comment; ?>" id="input-comment" class="form-control"><?php echo $config_comment; ?></textarea>
</div>
</div>
<?php if ($locations) { ?>
Expand Down

0 comments on commit 9add29b

Please sign in to comment.