Skip to content
This repository was archived by the owner on Apr 29, 2019. It is now read-only.

Commit 57b5fdb

Browse files
🔃 [EngCom] Public Pull Requests - 2.3-develop
Accepted Public Pull Requests: - magento/magento2#15387: ADHOC: update the contribution templates (by @dmanners) - magento/magento2#15397: [Forwardport] Fixed typo mistake in function comment (by @dmytro-ch) - magento/magento2#15395: [Forwardport] Removed non-existing argument (by @dmytro-ch) - magento/magento2#11368: Fix meta title property (by @slackerzz) Fixed GitHub Issues: - magento/magento2#2956: Unable to render page when 'meta title' page config param is set (reported by @volnnn) has been fixed in magento/magento2#11368 by @slackerzz in 2.3-develop branch Related commits: 1. 32e2e4d 2. b11c7e7 3. 474e43c
2 parents ebbee92 + 0461909 commit 57b5fdb

File tree

7 files changed

+52
-17
lines changed

7 files changed

+52
-17
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,35 @@
1-
<!--- Provide a general summary of the issue in the Title above -->
2-
<!--- Before adding new issues, please, check this article https://github.com/magento/magento2/wiki/Issue-reporting-guidelines-->
1+
<!---
2+
Thank you for contributing to Magento.
3+
To help us process this issue we recommend that you add the following information:
4+
- Summary of the issue,
5+
- Information on your environment,
6+
- Steps to reproduce,
7+
- Expected and actual results,
8+
9+
Please also have a look at our guidelines article before adding a new issue https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
10+
-->
311

412
### Preconditions
5-
<!--- Provide a more detailed information of environment you use -->
6-
<!--- Magento version, tag, HEAD, etc., PHP & MySQL version, etc.. -->
13+
<!---
14+
Please provide as detailed information about your environment as possible.
15+
For example Magento version, tag, HEAD, PHP & MySQL version, etc..
16+
-->
717
1.
818
2.
919

1020
### Steps to reproduce
11-
<!--- Provide a set of unambiguous steps to reproduce this bug include code, if relevant -->
21+
<!---
22+
It is important to provide a set of clear steps to reproduce this bug.
23+
If relevant please include code samples
24+
-->
1225
1.
1326
2.
1427
3.
1528

1629
### Expected result
1730
<!--- Tell us what should happen -->
18-
1.
31+
1. [Screenshot, logs]
1932

2033
### Actual result
2134
<!--- Tell us what happens instead -->
2235
1. [Screenshot, logs]
23-
24-
<!--- (This may be platform independent comment) -->

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,32 @@
1-
<!--- Provide a general summary of the Pull Request in the Title above -->
1+
<!---
2+
Thank you for contributing to Magento.
3+
To help us process this pull request we recommend that you add the following information:
4+
- Summary of the pull request,
5+
- Issue(s) related to the changes made,
6+
- Manual testing scenarios,
7+
-->
8+
9+
<!--- Please provide a general summary of the Pull Request in the Title above -->
210

311
### Description
4-
<!--- Provide a description of the changes proposed in the pull request -->
12+
<!---
13+
Please provide a description of the changes proposed in the pull request.
14+
Letting us know what has changed and why it needed changing will help us validate this pull request.
15+
-->
516

617
### Fixed Issues (if relevant)
7-
<!--- Provide a list of fixed issues in the format magento/magento2#<issue_number>, if relevant -->
18+
<!---
19+
If relevant, please provide a list of fixed issues in the format magento/magento2#<issue_number>.
20+
There could be 1 or more issues linked here and it will help us find some more information about the reasoning behind this change.
21+
-->
822
1. magento/magento2#<issue_number>: Issue title
923
2. ...
1024

1125
### Manual testing scenarios
12-
<!--- Provide a set of unambiguous steps to test the proposed code change -->
26+
<!---
27+
Please provide a set of unambiguous steps to test the proposed code change.
28+
Giving us manual testing scenarios will help with the processing and validation process.
29+
-->
1330
1. ...
1431
2. ...
1532

app/code/Magento/Paypal/Model/Api/Nvp.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1025,7 +1025,7 @@ public function callGetPalDetails()
10251025
}
10261026

10271027
/**
1028-
* Set Customer BillingA greement call
1028+
* Set Customer BillingAgreement call
10291029
*
10301030
* @return void
10311031
* @link https://cms.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=developer/e_howto_api_nvp_r_SetCustomerBillingAgreement
@@ -1425,15 +1425,15 @@ protected function _deformatNVP($nvpstr)
14251425
$nvpstr = strpos($nvpstr, "\r\n\r\n") !== false ? substr($nvpstr, strpos($nvpstr, "\r\n\r\n") + 4) : $nvpstr;
14261426

14271427
while (strlen($nvpstr)) {
1428-
//postion of Key
1428+
//position of Key
14291429
$keypos = strpos($nvpstr, '=');
14301430
//position of value
14311431
$valuepos = strpos($nvpstr, '&') ? strpos($nvpstr, '&') : strlen($nvpstr);
14321432

14331433
/*getting the Key and Value values and storing in a Associative Array*/
14341434
$keyval = substr($nvpstr, $intial, $keypos);
14351435
$valval = substr($nvpstr, $keypos + 1, $valuepos - $keypos - 1);
1436-
//decoding the respose
1436+
//decoding the response
14371437
$nvpArray[urldecode($keyval)] = urldecode($valval);
14381438
$nvpstr = substr($nvpstr, $valuepos + 1, strlen($nvpstr));
14391439
}

app/code/Magento/Translation/Block/Html/Head/Config.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ class Config extends \Magento\Framework\View\Element\AbstractBlock
3434

3535
/**
3636
* @param \Magento\Framework\View\Element\Context $context
37-
* @param RequireJsConfig $config
3837
* @param \Magento\Framework\View\Page\Config $pageConfig
3938
* @param \Magento\Translation\Model\FileManager $fileManager
4039
* @param Inline $inline

lib/internal/Magento/Framework/View/Page/Config.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ class Config
117117
'description' => null,
118118
'keywords' => null,
119119
'robots' => null,
120+
'title' => null,
120121
];
121122

122123
/**

lib/internal/Magento/Framework/View/Page/Config/Renderer.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,12 @@ public function renderMetadata()
136136
protected function processMetadataContent($name, $content)
137137
{
138138
$method = 'get' . $this->string->upperCaseWords($name, '_', '');
139+
if ($name === 'title') {
140+
if (!$content) {
141+
$content = $this->escaper->escapeHtml($this->pageConfig->$method()->get());
142+
}
143+
return $content;
144+
}
139145
if (method_exists($this->pageConfig, $method)) {
140146
$content = $this->pageConfig->$method();
141147
}

lib/internal/Magento/Framework/View/Test/Unit/Page/ConfigTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
use Magento\Framework\View\Page\Config;
1414

1515
/**
16-
* @covers Magento\Framework\View\Page\Config
16+
* @covers \Magento\Framework\View\Page\Config
1717
*
1818
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
1919
*/
@@ -139,6 +139,7 @@ public function testMetadata()
139139
'description' => null,
140140
'keywords' => null,
141141
'robots' => null,
142+
'title' => null,
142143
'name' => 'test_value',
143144
'html_encoded' => '&lt;title&gt;&lt;span class=&quot;test&quot;&gt;Test&lt;/span&gt;&lt;/title&gt;',
144145
];

0 commit comments

Comments
 (0)