Skip to content

Commit 1e3ec4e

Browse files
AndriyNasinnykAndriyNasinnyk
committed
MAGETWO-32161: Logging is broken
1 parent fcea296 commit 1e3ec4e

File tree

9 files changed

+25
-25
lines changed

9 files changed

+25
-25
lines changed

‎app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
?>
1010
<?php /** @var $this \Magento\AdminNotification\Block\ToolbarEntry */ ?>
1111
<?php $notificationCount = $block->getUnreadNotificationCount(); ?>
12-
<div data-mage-init='{"toolbarEntry": {}}' class="notifications-summary" data-notification-count="<?php echo $this->escapeHtml($notificationCount); ?>">
12+
<div data-mage-init='{"toolbarEntry": {}}' class="notifications-summary" data-notification-count="<?php echo $block->escapeHtml($notificationCount); ?>">
1313
<?php if ($notificationCount > 0) : ?>
1414
<a href="<?php echo $block->getUrl('adminhtml/notification/index'); ?>" class="action notifications-action" data-mage-init='{"dropdown":{}}' title="<?php echo __('Notifications'); ?>" data-toggle="dropdown">
1515
<span class="text"><?php echo __('Notifications'); ?></span>

‎app/code/Magento/Backend/view/adminhtml/templates/dashboard/store/switcher.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
var select = $('order_amounts_period');
5858
}
5959
var periodParam = select.value ? 'period/' + select.value + '/' : '';
60-
setLocation('<?php echo $this->getSwitchUrl() ?>' + storeParam + periodParam);
60+
setLocation('<?php echo $block->getSwitchUrl() ?>' + storeParam + periodParam);
6161
}
6262
});
6363
</script>

‎app/code/Magento/Backend/view/adminhtml/templates/pageactions.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
?>
1010
<?php if ($block->getChildHtml()):?>
11-
<div data-mage-init='{"floatingHeader": {}}' class="page-actions" <?php echo $this->getUiId('content-header') ?>>
11+
<div data-mage-init='{"floatingHeader": {}}' class="page-actions" <?php echo $block->getUiId('content-header') ?>>
1212
<?php echo $block->getChildHtml(); ?>
1313
</div>
1414
<?php endif; ?>

‎app/code/Magento/Review/view/frontend/templates/review.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
});
3535
}
3636

37-
processReviews('<?php echo $this->getProductReviewUrl();?>');
37+
processReviews('<?php echo $block->getProductReviewUrl();?>');
3838

3939
$(function () {
4040
$('.product-info-main .reviews-actions a').click(function (event) {

‎app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<script src="<?php echo $block->getViewFileUrl('requirejs/require.js') ?>"></script>
3131
<script src="<?php echo $block->getViewFileUrl('jquery.js') ?>"></script>
3232
<script src="<?php echo $block->getViewFileUrl('Magento_User::app-config.js') ?>"></script>
33-
<?php echo $this->getChildHtml('requirejs-config');?>
33+
<?php echo $block->getChildHtml('requirejs-config');?>
3434

3535
<body id="page-login" class="page-login page-forgotpassword">
3636
<div class="wrapper">

‎app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ $item = $block->getItem();
6666
<?php if ($block->displayFinalPrice()): ?>
6767
<span class="cart-tax-total"
6868
data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $item->getId(); ?>"}'>
69-
<span class="weee" data-label="<?php echo $this->escapeHtml(__('Total')); ?>">
70-
<?php echo $this->formatPrice($this->getFinalRowDisplayPriceExclTax()); ?>
69+
<span class="weee" data-label="<?php echo $block->escapeHtml(__('Total')); ?>">
70+
<?php echo $block->formatPrice($block->getFinalRowDisplayPriceExclTax()); ?>
7171
</span>
7272
</span>
7373
<?php endif; ?>

‎app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ $item = $block->getItem();
6666
<?php if ($block->displayFinalPrice()): ?>
6767
<span class="cart-tax-total"
6868
data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $item->getId(); ?>"}'>
69-
<span class="weee" data-label="<?php echo $this->escapeHtml(__('Total')); ?>">
70-
<?php echo $this->formatPrice($this->getFinalUnitDisplayPriceExclTax()); ?>
69+
<span class="weee" data-label="<?php echo $block->escapeHtml(__('Total')); ?>">
70+
<?php echo $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()); ?>
7171
</span>
7272
</span>
7373
<?php endif; ?>

‎pub/errors/default/page.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<!doctype html>
88
<html xmlns="http://www.w3.org/1999/xhtml" >
99
<head>
10-
<title><?php echo $block->pageTitle?></title>
11-
<base href="<?php echo $block->getViewFileUrl()?>" />
10+
<title><?php echo $this->pageTitle?></title>
11+
<base href="<?php echo $this->getViewFileUrl()?>" />
1212
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
1313
<meta name="robots" content="*"/>
1414
<link rel="stylesheet" href="css/styles.css" type="text/css" />

‎pub/errors/default/report.phtml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,73 +6,73 @@
66
?>
77

88
<h1>There has been an error processing your request</h1>
9-
<?php if ($block->showSentMsg): ?>
9+
<?php if ($this->showSentMsg): ?>
1010
<div class="message success">
1111
<div>Your message was submitted and will be responded as soon as possible. Thank you for reporting.</div>
1212
</div>
1313
<?php endif; ?>
14-
<?php if ($block->showSendForm): ?>
14+
<?php if ($this->showSendForm): ?>
1515
<div class="message info">
1616
<div>
1717
We are currently experiencing some technical issues. We apologize for the inconvenience and will contact you shortly to resolve the issue. To help us serve you please fill in the form below.
1818
</div>
1919
</div>
20-
<?php if ($block->showErrorMsg): ?>
20+
<?php if ($this->showErrorMsg): ?>
2121
<div class="message error">
2222
<div>
2323
Please fill all required fields with valid information
2424
</div>
2525
</div>
2626
<?php endif; ?>
27-
<form action="<?php echo "{$block->getBaseUrl(true)}errors/report.php?id={$block->reportId}" ?>" method="post" id="form-validate" class="form">
27+
<form action="<?php echo "{$this->getBaseUrl(true)}errors/report.php?id={$this->reportId}" ?>" method="post" id="form-validate" class="form">
2828
<fieldset class="fieldset" data-hasrequired="* Required Fields">
2929
<legend class="legend"><span>Personal Information</span></legend><br />
3030
<div class="field firstname required">
3131
<label for="firstname" class="label">First Name</label>
3232
<div class="control">
33-
<input type="text" name="firstname" id="firstname" value="<?php echo $block->postData['firstName'] ?>" title="First Name" class="required-entry input-text" />
33+
<input type="text" name="firstname" id="firstname" value="<?php echo $this->postData['firstName'] ?>" title="First Name" class="required-entry input-text" />
3434
</div>
3535
</div>
3636
<div class="field lastname required">
3737
<label for="lastname" class="label">Last Name</label>
3838
<div class=control">
39-
<input type="text" name="lastname" id="lastname" value="<?php echo $block->postData['lastName'] ?>" title="Last Name" class="required-entry input-text" />
39+
<input type="text" name="lastname" id="lastname" value="<?php echo $this->postData['lastName'] ?>" title="Last Name" class="required-entry input-text" />
4040
</div>
4141
</div>
4242
<div class="field email required">
4343
<label for="email_address" class="label">Email Address</label>
4444
<div class=control">
45-
<input type="text" name="email" id="email_address" value="<?php echo $block->postData['email'] ?>" title="Email Address" class="validate-email required-entry input-text" />
45+
<input type="text" name="email" id="email_address" value="<?php echo $this->postData['email'] ?>" title="Email Address" class="validate-email required-entry input-text" />
4646
</div>
4747
</div>
4848
<div class="field telephone">
4949
<label for="telephone" class="label">Telephone</label>
5050
<div class=control">
51-
<input type="text" name="telephone" id="telephone" value="<?php echo $block->postData['telephone'] ?>" title="Telephone" class="input-text" />
51+
<input type="text" name="telephone" id="telephone" value="<?php echo $this->postData['telephone'] ?>" title="Telephone" class="input-text" />
5252
</div>
5353
</div>
5454
<div class="field comment">
5555
<label for="comment" class="label">Comment</label>
5656
<div class=control">
57-
<textarea name="comment" cols="5" rows="3" class="textarea"><?php echo $block->postData['comment'] ?></textarea>
57+
<textarea name="comment" cols="5" rows="3" class="textarea"><?php echo $this->postData['comment'] ?></textarea>
5858
</div>
5959
</div>
6060
</fieldset>
6161
<div class="actions-toolbar">
6262
<button name="submit" class="action primary" type="submit"><span>Submit</span></button>
6363
</div>
6464
</form>
65-
<?php elseif ('' == $block->reportAction): ?>
65+
<?php elseif ('' == $this->reportAction): ?>
6666
<p><em>Exception printing is disabled by default for security reasons.</em></p>
6767
<?php endif; ?>
6868

69-
<?php if ($block->reportAction == 'print'): ?>
69+
<?php if ($this->reportAction == 'print'): ?>
7070
<div class="trace-container">
7171
<div class="trace">
72-
<pre><?php echo htmlspecialchars($block->reportData[0]) ?></pre>
72+
<pre><?php echo htmlspecialchars($this->reportData[0]) ?></pre>
7373
</div>
7474
</div>
7575
<?php endif; ?>
76-
<?php if ($block->reportId): ?>
77-
<p>Error log record number: <?php echo $block->reportId ?></p>
76+
<?php if ($this->reportId): ?>
77+
<p>Error log record number: <?php echo $this->reportId ?></p>
7878
<?php endif; ?>

0 commit comments

Comments
 (0)