Skip to content

Commit 3c2ae84

Browse files
committed
Normalize additional blockquotes after merge conflict
1 parent aa9593d commit 3c2ae84

File tree

1 file changed

+4
-25
lines changed

1 file changed

+4
-25
lines changed

tests/php/test-amp-facebook-embed.php

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,7 @@ public function get_raw_embed_dataset() {
7777
'https://www.facebook.com/zuck/posts/10102593740125791' . PHP_EOL,
7878
'
7979
<amp-facebook width="500" height="400" data-href="https://www.facebook.com/zuck/posts/10102593740125791" data-embed-as="post" layout="responsive">
80-
<blockquote cite="https://www.facebook.com/zuck/posts/10102593740125791" class="fb-xfbml-parse-ignore" fallback="">
81-
<p>February 4 is Facebook’s 12th birthday!</p>
82-
<p>Our anniversary has a lot of meaning to me as an opportunity to reflect on how…</p>
83-
<p>Posted by <a href="https://www.facebook.com/zuck">Mark Zuckerberg</a> on <a href="https://www.facebook.com/zuck/posts/10102593740125791">Tuesday, January 12, 2016</a></p>
84-
</blockquote>
80+
<blockquote cite="https://www.facebook.com/zuck/posts/10102593740125791" class="fb-xfbml-parse-ignore" fallback=""><!--blockquote_contents--></blockquote>
8581
</amp-facebook>
8682
' . PHP_EOL,
8783
],
@@ -90,9 +86,7 @@ public function get_raw_embed_dataset() {
9086
'https://www.facebook.com/notes/facebook-engineering/under-the-hood-the-javascript-sdk-truly-asynchronous-loading/10151176218703920/' . PHP_EOL,
9187
'
9288
<amp-facebook width="500" height="400" data-href="https://www.facebook.com/notes/facebook-engineering/under-the-hood-the-javascript-sdk-truly-asynchronous-loading/10151176218703920/" data-embed-as="post" layout="responsive">
93-
<blockquote cite="https://www.facebook.com/notes/facebook-engineering/under-the-hood-the-javascript-sdk-truly-asynchronous-loading/10151176218703920/" class="fb-xfbml-parse-ignore" fallback="">
94-
<p>Posted by <a href="https://www.facebook.com/Engineering/">Facebook Engineering</a> on <a href="https://www.facebook.com/notes/facebook-engineering/under-the-hood-the-javascript-sdk-truly-asynchronous-loading/10151176218703920/">Saturday, December 8, 2012</a></p>
95-
</blockquote>
89+
<blockquote cite="https://www.facebook.com/notes/facebook-engineering/under-the-hood-the-javascript-sdk-truly-asynchronous-loading/10151176218703920/" class="fb-xfbml-parse-ignore" fallback=""><!--blockquote_contents--></blockquote>
9690
</amp-facebook>
9791
' . PHP_EOL,
9892
],
@@ -101,10 +95,7 @@ public function get_raw_embed_dataset() {
10195
'https://www.facebook.com/photo.php?fbid=10102533316889441&set=a.529237706231.2034669.4&type=3&theater' . PHP_EOL,
10296
'
10397
<amp-facebook width="500" height="400" data-href="https://www.facebook.com/photo.php?fbid=10102533316889441&amp;set=a.529237706231.2034669.4&amp;type=3&amp;theater" data-embed-as="post" layout="responsive">
104-
<blockquote cite="https://www.facebook.com/photo.php?fbid=10102533316889441&amp;set=a.529237706231&amp;type=3" class="fb-xfbml-parse-ignore" fallback="">
105-
<p>Meanwhile, Beast turned to the dark side.</p>
106-
<p>Posted by <a href="https://www.facebook.com/zuck">Mark Zuckerberg</a> on <a href="https://www.facebook.com/photo.php?fbid=10102533316889441&amp;set=a.529237706231&amp;type=3">Friday, December 18, 2015</a></p>
107-
</blockquote>
98+
<blockquote cite="https://www.facebook.com/photo.php?fbid=10102533316889441&amp;set=a.529237706231&amp;type=3" class="fb-xfbml-parse-ignore" fallback=""><!--blockquote_contents--></blockquote>
10899
</amp-facebook>
109100
' . PHP_EOL,
110101
],
@@ -113,19 +104,7 @@ public function get_raw_embed_dataset() {
113104
'https://www.facebook.com/zuck/videos/10102509264909801/' . PHP_EOL,
114105
'
115106
<amp-facebook width="500" height="400" data-href="https://www.facebook.com/zuck/videos/10102509264909801/" data-embed-as="video" layout="responsive">
116-
<blockquote cite="https://www.facebook.com/zuck/videos/10102509264909801/" class="fb-xfbml-parse-ignore" fallback="">
117-
<p><a href="https://www.facebook.com/zuck/videos/10102509264909801/"></a></p>
118-
<p>I want to share a few more thoughts on the Chan Zuckerberg Initiative before I just start posting photos of me and Max for a while 🙂</p>
119-
<p>I hope one idea comes through: that we as a society should make investments now to ensure this world is much better for the next generation.</p>
120-
<p>I don\'t think we do enough of this right now. </p>
121-
<p>Sure, there are many areas where investment now will solve problems for today and also improve the world for the future. We do muster the will to solve some of those.</p>
122-
<p>But for the problems that will truly take decades of investment before we see any major return, we are dramatically underinvested.</p>
123-
<p>One example is basic science research to cure disease. Another is developing clean energy to protect the world for the future. Another is the slow and steady improvement to modernize schools. Others are systematic issues around poverty and justice. There is a long list of these opportunities.</p>
124-
<p>The role of philanthropy is to invest in important areas that companies and governments aren\'t funding — either because they may not be profitable for companies or because they are too long term for people to want to invest now.</p>
125-
<p>In the case of disease, basic research often needs to be funded before biotech or pharma companies can create drugs to help people. If we invest more in science, we can make faster progress towards curing disease.</p>
126-
<p>Our investment in the Chan Zuckerberg Initiative is small compared to what the world can invest in solving these great challenges. My hope is that our work inspires more people to invest in these longer term issues. If we can do that, then we can all really make a difference together.</p>
127-
<p>Posted by <a href="https://www.facebook.com/zuck">Mark Zuckerberg</a> on Friday, December 4, 2015</p>
128-
</blockquote>
107+
<blockquote cite="https://www.facebook.com/zuck/videos/10102509264909801/" class="fb-xfbml-parse-ignore" fallback=""><!--blockquote_contents--></blockquote>
129108
</amp-facebook>
130109
' . PHP_EOL,
131110
],

0 commit comments

Comments
 (0)