DevHeads.net

Postings by Peter Cowburn

com web/php: fix ampersand entity in ZendCon 2017 entry: archive/entries/2017-06-14-1.xml

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=c31416d61bb21067a2a5d77facecbd1d28fd7008" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=c31416d61bb21067a2a5d77facecbd1d28fd7008">http://git.php.net/?p=web/php.git;a=commitdiff;h=c31416d61bb21067a2a5d77...</a>

Log:
fix ampersand entity in ZendCon 2017 entry

Changed paths:
M archive/entries/2017-06-14-1.xml

Diff:
diff --git a/archive/entries/2017-06-14-1.xml b/archive/entries/2017-06-14-1.xml
index 815442e..843ca16 100644
--- a/archive/entries/2017-06-14-1.xml
+++ b/archive/entries/2017-06-14-1.xml
@@ -3,7 +3,7 @@
<title>ZendCon 2017</title>
<id>http://php.net/archive/2017.php#id2017-06-14-1</id>
<published>2017-06-14T00:00:01+00:00</published>
- <updated>2017-06-14T12:23:00+00:00</updat

com web/php: update PHPNW17 announcement date to today: archive/entries/2017-08-30-1.xml archive/entries/2017-09-13-1.xml

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=0e6e2492f3c8fff134bea47ef7a82798b7f6b541" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=0e6e2492f3c8fff134bea47ef7a82798b7f6b541">http://git.php.net/?p=web/php.git;a=commitdiff;h=0e6e2492f3c8fff134bea47...</a>

Log:
update PHPNW17 announcement date to today

Changed paths:
D archive/entries/2017-08-30-1.xml
A archive/entries/2017-09-13-1.xml

Diff:
diff --git a/archive/entries/2017-08-30-1.xml b/archive/entries/2017-08-30-1.xml
deleted file mode 100644
index 77e34bd..0000000
--- a/archive/entries/2017-08-30-1.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<entry xmlns="http://www.w3.org/2005/Atom" xmlns:default="http://php.net/ns/news">
- <title>PHP North West 20

com web/php: Merge branch 'master' into master: archive/archive.xml

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=319df095090f0633f8f202237eebfb079bfa1eeb" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=319df095090f0633f8f202237eebfb079bfa1eeb">http://git.php.net/?p=web/php.git;a=commitdiff;h=319df095090f0633f8f2022...</a>

Log:
Merge branch 'master' into master

Changed paths:
MM archive/archive.xml

Diff:
diff --cc archive/archive.xml
index 95b8877,aa14db5..79db45f
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@@ -9,7 -9,9 +9,10 @@@
<uri>http://php.net/contact</uri>
<email>php- ... at lists dot php.net</email>
</author>
+ <xi:include href="entries/2017-09-01-1.xml"/>
+ <xi:include href="entries/2017-08-31-1.xml"/>
+ <xi:include href="entries/2017-08-31-2.xml"/>
+ <xi:include hr

com web/php: Add details about PHP North West 2017 (PHPNW17), in Manchester, UK: archive/archive.xml archive/entries/2017-08-30-1.xml images/news/phpnw17.png

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=f6276b318957773a448324358b0d3a7be528c2df" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=f6276b318957773a448324358b0d3a7be528c2df">http://git.php.net/?p=web/php.git;a=commitdiff;h=f6276b318957773a4483243...</a>

Log:
Add details about PHP North West 2017 (PHPNW17), in Manchester, UK

Changed paths:
M archive/archive.xml
A archive/entries/2017-08-30-1.xml
A images/news/phpnw17.png

Diff:
diff --git a/archive/archive.xml b/archive/archive.xml
index 21ae12c..95b8877 100644
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@ -9,6 +9,7 @@
<uri>http://php.net/contact</uri>
<email>php- ... at lists dot php.net</email>
</author>
+ <xi:include href="entries/2017-08-30-1.xml"/>
<xi:

com web/php: Corrected the ZendCon conference category: archive/entries/2017-06-14-1.xml

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=e606ab7887bf2bbcf9226b01d5b9cfeed3f465d0" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=e606ab7887bf2bbcf9226b01d5b9cfeed3f465d0">http://git.php.net/?p=web/php.git;a=commitdiff;h=e606ab7887bf2bbcf9226b0...</a>

Log:
Corrected the ZendCon conference category

Changed paths:
M archive/entries/2017-06-14-1.xml

Diff:
diff --git a/archive/entries/2017-06-14-1.xml b/archive/entries/2017-06-14-1.xml
index 782d652..815442e 100644
--- a/archive/entries/2017-06-14-1.xml
+++ b/archive/entries/2017-06-14-1.xml
@@ -5,7 +5,7 @@
<published>2017-06-14T00:00:01+00:00</published>
<updated>2017-06-14T12:23:00+00:00</updated>
<default:finalTeaserDate xmlns="http://php.net/ns/news">2017-09-01</default:finalTe

com web/news: Fix error message not being displayed with the new layout: common.php

Link: <a href="http://git.php.net/?p=web/news.git;a=commitdiff;h=b980e41e829c414cf86d221508f76dd8a000a952" title="http://git.php.net/?p=web/news.git;a=commitdiff;h=b980e41e829c414cf86d221508f76dd8a000a952">http://git.php.net/?p=web/news.git;a=commitdiff;h=b980e41e829c414cf86d22...</a>

Log:
Fix error message not being displayed with the new layout

Changed paths:
M common.php

Diff:
diff --git a/common.php b/common.php
index 2ea62fb..e9988f1 100644
--- a/common.php
+++ b/common.php
@@ -12,7 +12,7 @@ define('NNTP_HOST', $NNTP_HOST);

function error($str) {
head("PHP news : error");
- echo "<blockquote><strong>Error:</strong> ".to_utf8($str)."</blockquote>\n";
+ echo "<section class=\"content\"><blockquote><strong>Error:</strong> ".to_utf8($str)."</blockquote></secti

com web/php: Remove source.php from robots.txt: robots.txt

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=009b722ce849e1fe431f050ef6126ddbd4be9efb" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=009b722ce849e1fe431f050ef6126ddbd4be9efb">http://git.php.net/?p=web/php.git;a=commitdiff;h=009b722ce849e1fe431f050...</a>

Log:
Remove source.php from robots.txt

I've removed source.php from robots.txt as source.php no longer exists, and was still in the list from the previous version of PHP.net.

Changed paths:
M robots.txt

Diff:
diff --git a/robots.txt b/robots.txt
index 493a453..4348f2d 100644
--- a/robots.txt
+++ b/robots.txt
@@ -3,7 +3,6 @@ Disallow: /backend/
Disallow: /distributions/
Disallow: /stats/
Disallow: /server-status/
-Disallow: /source.php
Disallow: /search.php
Disallow: /mod.php
Disa

com web/php: pad category name in createNewsEmpty prompt: bin/createNewsEntry

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=1c25572c7b44c525760a822f810b873a0af1d9e7" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=1c25572c7b44c525760a822f810b873a0af1d9e7">http://git.php.net/?p=web/php.git;a=commitdiff;h=1c25572c7b44c525760a822...</a>

Log:
pad category name in createNewsEmpty prompt

Changes the prompt from this:

Categories:
0: frontpage [PHP.net frontpage news]
1: releases [New PHP release]
2: conferences [Conference announcement]
3: cfp [Call for Papers]

To this:

Categories:
0: frontpage [PHP.net frontpage news]
1: releases [New PHP release]
2: conferences [Conference announcement]
3: cfp [Call for Papers]

Changed paths:
M bin/createNewsEntry

Diff:
diff --git a/bin/createNewsEntry b/

com web/php: fix invalid markup in Conferência PHPRS 2017 news entry: archive/entries/2017-03-04-1.xml

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=a1ac26e5c9c2765e1239ddf6de1f9aacc1aa7a2a" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=a1ac26e5c9c2765e1239ddf6de1f9aacc1aa7a2a">http://git.php.net/?p=web/php.git;a=commitdiff;h=a1ac26e5c9c2765e1239ddf...</a>

Log:
fix invalid markup in Conferência PHPRS 2017 news entry

Changed paths:
M archive/entries/2017-03-04-1.xml

Diff:
diff --git a/archive/entries/2017-03-04-1.xml b/archive/entries/2017-03-04-1.xml
index e212239..46c7752 100644
--- a/archive/entries/2017-03-04-1.xml
+++ b/archive/entries/2017-03-04-1.xml
@@ -15,7 +15,7 @@

<p>From May 12 to 13, 2017, in Porto Alegre / RS-Brazil, the first day will be held workshops and the second lectures.</p>

com web/php: add entries/2017-02-24-1.xml to archive.xml: archive/archive.xml

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=a22022cf564f2ed2fa3fef44e9605268b03154fc" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=a22022cf564f2ed2fa3fef44e9605268b03154fc">http://git.php.net/?p=web/php.git;a=commitdiff;h=a22022cf564f2ed2fa3fef4...</a>

Log:
add entries/2017-02-24-1.xml to archive.xml

Changed paths:
M archive/archive.xml

Diff:
diff --git a/archive/archive.xml b/archive/archive.xml
index b5179fd..33ef44b 100644
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@ -9,7 +9,7 @@
<uri>http://php.net/contact</uri>
<email>php- ... at lists dot php.net</email>
</author>

com web/bugs: more spam words: include/functions.php

Link: <a href="http://git.php.net/?p=web/bugs.git;a=commitdiff;h=4cf267280f336755c17d7dc935fb390e9a78b2e7" title="http://git.php.net/?p=web/bugs.git;a=commitdiff;h=4cf267280f336755c17d7dc935fb390e9a78b2e7">http://git.php.net/?p=web/bugs.git;a=commitdiff;h=4cf267280f336755c17d7d...</a>

Log:
more spam words

Changed paths:
M include/functions.php

Diff:
diff --git a/include/functions.php b/include/functions.php
index 7ed8ae3..de52fa9 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -298,6 +298,9 @@ function is_spam($string)
'leslunettesdesoleil',
'PaulRGuthrie',
'[a-z]*?fuck[a-z]*?',
+ 'jerseys',
+ 'wholesale',
+ 'fashionretailshop01',
);

if (preg_match('/\b('. implode('|', $keywords) . ')\b/i', $string)) {

com web/bugs: Check comment email addresses against spam word list: www/bug.php

Link: <a href="http://git.php.net/?p=web/bugs.git;a=commitdiff;h=50136fe0aeea66ad187b408a4c4237fed938c42e" title="http://git.php.net/?p=web/bugs.git;a=commitdiff;h=50136fe0aeea66ad187b408a4c4237fed938c42e">http://git.php.net/?p=web/bugs.git;a=commitdiff;h=50136fe0aeea66ad187b40...</a>

Log:
Check comment email addresses against spam word list

Changed paths:
M www/bug.php

Diff:
diff --git a/www/bug.php b/www/bug.php
index af05707..c3635d2 100644
--- a/www/bug.php
+++ b/www/bug.php
@@ -211,6 +211,10 @@ if (isset($_POST['ncomment']) && !isset($_POST['preview']) && $edit == 3) {
$errors[] = "Please do not SPAM our bug system.";
}

+ if (is_spam($_POST['in']['commentemail'])) {
+ $errors[] = "Please do not SPAM our bug system.";
+ }
+
if (!$errors) {
do {

com web/php: use ScotlandPHP logo provided by Paul: archive/entries/2016-08-27-1.xml images/news/scotlandphp-conf-2016.png images/news/scotlandphp-conference.jpg

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=c2ee0eee25aed64ae6589fb6596513a28682cdbe" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=c2ee0eee25aed64ae6589fb6596513a28682cdbe">http://git.php.net/?p=web/php.git;a=commitdiff;h=c2ee0eee25aed64ae6589fb...</a>

Log:
use ScotlandPHP logo provided by Paul

Changed paths:
M archive/entries/2016-08-27-1.xml
D images/news/scotlandphp-conf-2016.png
A images/news/scotlandphp-conference.jpg

Diff:
diff --git a/archive/entries/2016-08-27-1.xml b/archive/entries/2016-08-27-1.xml
index 5dcd256..fe9354e 100644
--- a/archive/entries/2016-08-27-1.xml
+++ b/archive/entries/2016-08-27-1.xml
@@ -3,11 +3,11 @@
<title>ScotlandPHP 2016</title>
<id>http://php.net/archive/2016.php#id2016-08-27-1</id>
<

com web/php: ScotlandPHP 2016 conference announcement: archive/archive.xml archive/entries/2016-08-27-1.xml images/news/scotlandphp-conf-2016.png

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=3918ca3faa07b7baa583f816b135dfb550fb9710" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=3918ca3faa07b7baa583f816b135dfb550fb9710">http://git.php.net/?p=web/php.git;a=commitdiff;h=3918ca3faa07b7baa583f81...</a>

Log:
ScotlandPHP 2016 conference announcement

Changed paths:
M archive/archive.xml
A archive/entries/2016-08-27-1.xml
A images/news/scotlandphp-conf-2016.png

Diff:
diff --git a/archive/archive.xml b/archive/archive.xml
index a202fb7..449b409 100644
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@ -9,6 +9,7 @@
<uri>http://php.net/contact</uri>
<email>php- ... at lists dot php.net</email>
</author>
+ <xi:include href="entries/2016-08-27-1.xml"/>
<xi:include href

com web/php: version typo, 7.6.25 to 5.6.25: archive/entries/2016-08-18-2.xml

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=9c6bcc4be1d203b2a98e42e0d05f5166060c1608" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=9c6bcc4be1d203b2a98e42e0d05f5166060c1608">http://git.php.net/?p=web/php.git;a=commitdiff;h=9c6bcc4be1d203b2a98e42e...</a>

Log:
version typo, 7.6.25 to 5.6.25

Changed paths:
M archive/entries/2016-08-18-2.xml

Diff:
diff --git a/archive/entries/2016-08-18-2.xml b/archive/entries/2016-08-18-2.xml
index acc7bca..e902ef3 100644
--- a/archive/entries/2016-08-18-2.xml
+++ b/archive/entries/2016-08-18-2.xml
@@ -3,7 +3,7 @@
<title>PHP 5.6.25 is released</title>
<id>http://php.net/archive/2016.php#id2016-08-18-2</id>
<published>2016-08-18T16:43:25-07:00</published>
- <updated>2016-08-18T16:43:25-07:00</upd

com web/php: fix teaser dates: archive/entries/2016-08-16-1.xml archive/entries/2016-08-16-2.xml

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=c0220a7870f81cacfa3cf8de56ff6b88ad7d6ab8" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=c0220a7870f81cacfa3cf8de56ff6b88ad7d6ab8">http://git.php.net/?p=web/php.git;a=commitdiff;h=c0220a7870f81cacfa3cf8d...</a>

Log:
fix teaser dates

Changed paths:
M archive/entries/2016-08-16-1.xml
M archive/entries/2016-08-16-2.xml

Diff:
diff --git a/archive/entries/2016-08-16-1.xml b/archive/entries/2016-08-16-1.xml
index a0fc15f..93cdaee 100644
--- a/archive/entries/2016-08-16-1.xml
+++ b/archive/entries/2016-08-16-1.xml
@@ -3,8 +3,8 @@
<title>ZendCon 2016</title>
<id>http://php.net/archive/2016.php#id2016-08-16-1</id>
<published>2016-08-16T00:00:01+00:00</published>
- <updated>2016-08-16T00:00:01+

com web/php: resize too large conf logos: images/news/phpconfasia2016-logo.png images/news/sunshinephp2017.png

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=5131ee127e903b6985d068fe6dc21012734106c2" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=5131ee127e903b6985d068fe6dc21012734106c2">http://git.php.net/?p=web/php.git;a=commitdiff;h=5131ee127e903b6985d068f...</a>

Log:
resize too large conf logos

Changed paths:
M images/news/phpconfasia2016-logo.png
M images/news/sunshinephp2017.png

Diff:
diff --git a/images/news/phpconfasia2016-logo.png b/images/news/phpconfasia2016-logo.png
index 0c90bcc..443044f 100644
Binary files a/images/news/phpconfasia2016-logo.png and b/images/news/phpconfasia2016-logo.png differ
diff --git a/images/news/sunshinephp2017.png b/images/news/sunshinephp2017.png
index a238670..caf1d6d 100644
Binary files a/images/news/suns

com web/php: Added new entries to the archive.: archive/archive.xml

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=d56834d9856eda560e330d0f82e505d029f66aa8" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=d56834d9856eda560e330d0f82e505d029f66aa8">http://git.php.net/?p=web/php.git;a=commitdiff;h=d56834d9856eda560e330d0...</a>

Log:
Added new entries to the archive.

Changed paths:
M archive/archive.xml

Diff:
diff --git a/archive/archive.xml b/archive/archive.xml
index 9181830..494082c 100644
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@ -9,6 +9,8 @@
<uri>http://php.net/contact</uri>
<email>php- ... at lists dot php.net</email>
</author>
+ <xi:include href="entries/2016-08-16-2.xml"/>
+ <xi:include href="entries/2016-08-16-1.xml"/>
<xi:include href="entries/2016-08-04-1.xml"/>
<xi:in

com web/php: Added information for the SunshinePHP 2017 CFP, and logo.: archive/entries/2016-08-16-2.xml images/news/sunshinephp2017.png

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=a93e532ab3505646633b588747612c36cc4047c1" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=a93e532ab3505646633b588747612c36cc4047c1">http://git.php.net/?p=web/php.git;a=commitdiff;h=a93e532ab3505646633b588...</a>

Log:
Added information for the SunshinePHP 2017 CFP, and logo.

Changed paths:
A archive/entries/2016-08-16-2.xml
A images/news/sunshinephp2017.png

Diff:
diff --git a/archive/entries/2016-08-16-2.xml b/archive/entries/2016-08-16-2.xml
new file mode 100644
index 0000000..14c13b6
--- /dev/null
+++ b/archive/entries/2016-08-16-2.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<entry xmlns="http://www.w3.org/2005/Atom" xmlns:default="http://php.net/ns/news">
+ <title>Sunshin

com web/php: Added info for ZendCon 2016 event, and logo.: archive/entries/2016-08-16-1.xml images/news/zendcon2016.png

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=2eafae08934182e0d0b834f7be2c97588b762155" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=2eafae08934182e0d0b834f7be2c97588b762155">http://git.php.net/?p=web/php.git;a=commitdiff;h=2eafae08934182e0d0b834f...</a>

Log:
Added info for ZendCon 2016 event, and logo.

Changed paths:
A archive/entries/2016-08-16-1.xml
A images/news/zendcon2016.png

Diff:
diff --git a/archive/entries/2016-08-16-1.xml b/archive/entries/2016-08-16-1.xml
new file mode 100644
index 0000000..a0fc15f
--- /dev/null
+++ b/archive/entries/2016-08-16-1.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<entry xmlns="http://www.w3.org/2005/Atom" xmlns:default="http://php.net/ns/news">
+ <title>ZendCon 2016</title>
+ <

com web/php: Fix page-tools hiding title on small devices: styles/theme-base.css

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=064f21a71272370c5d8e7d79018e805dd5156448" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=064f21a71272370c5d8e7d79018e805dd5156448">http://git.php.net/?p=web/php.git;a=commitdiff;h=064f21a71272370c5d8e7d7...</a>

Log:
Fix page-tools hiding title on small devices

Changed paths:
M styles/theme-base.css

Diff:
diff --git a/styles/theme-base.css b/styles/theme-base.css
index 821e62b..3543a77 100755
--- a/styles/theme-base.css
+++ b/styles/theme-base.css
@@ -402,12 +402,32 @@ hr {
}

.page-tools {
- margin-left:1.5rem;
- float: right;
- text-align: right;
- position: relative;
- z-index: 10;
+ text-align: center;
+}
+
+@media (min-width:650px){
+ .page-tools {
+ float: right;
+ text-al

com web/php: Adds a prepend link to the conf-list: conferences/index.php

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=f65d4114d707a40df43881f73f8d40f30720e735" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=f65d4114d707a40df43881f73f8d40f30720e735">http://git.php.net/?p=web/php.git;a=commitdiff;h=f65d4114d707a40df43881f...</a>

Log:
Adds a prepend link to the conf-list

That way it's easier to show people how to add a conference to the list.

Changed paths:
M conferences/index.php

Diff:
diff --git a/conferences/index.php b/conferences/index.php
index cb7c58f..a066d8b 100644
--- a/conferences/index.php
+++ b/conferences/index.php
@@ -26,7 +26,9 @@ foreach($NEWS_ENTRIES as $entry) {
}
}
}
-$panels = "";
+$panels = '<p class="prepend"><a href="https://wiki.php.net/conferences">Want to see your confe

com web/php: Added phpDay 2016: archive/archive.xml archive/entries/2016-04-18-1.xml

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=356b5346a72c7193a28b20e3bc7ebb225d29cb5b" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=356b5346a72c7193a28b20e3bc7ebb225d29cb5b">http://git.php.net/?p=web/php.git;a=commitdiff;h=356b5346a72c7193a28b20e...</a>

Log:
Added phpDay 2016

Changed paths:
M archive/archive.xml
A archive/entries/2016-04-18-1.xml

Diff:
diff --git a/archive/archive.xml b/archive/archive.xml
index 4dda810..a7f2fe4 100644
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@ -9,6 +9,7 @@
<uri>http://php.net/contact</uri>
<email>php- ... at lists dot php.net</email>
</author>
+ <xi:include href="entries/2016-04-18-1.xml"/>
<xi:include href="entries/2016-04-05-1.xml"/>
<xi:include href="entries/2016-03

com web/php: shrink PHPSerbia conf logo: images/news/phpsrb2016.jpg

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=0582d0350d7bcc8b6f9642e73ff7ba79f6fd38a8" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=0582d0350d7bcc8b6f9642e73ff7ba79f6fd38a8">http://git.php.net/?p=web/php.git;a=commitdiff;h=0582d0350d7bcc8b6f9642e...</a>

Log:
shrink PHPSerbia conf logo

Changed paths:
M images/news/phpsrb2016.jpg

Diff:
diff --git a/images/news/phpsrb2016.jpg b/images/news/phpsrb2016.jpg
index f9578c7..19f9f62 100644
Binary files a/images/news/phpsrb2016.jpg and b/images/news/phpsrb2016.jpg differ

com web/php: cannot have whitespace at top of XML file: archive/entries/2016-04-05-1.xml

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=38d7cf04b7d915a74dfb52087b14642b11b0cb0e" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=38d7cf04b7d915a74dfb52087b14642b11b0cb0e">http://git.php.net/?p=web/php.git;a=commitdiff;h=38d7cf04b7d915a74dfb520...</a>

Log:
cannot have whitespace at top of XML file

Changed paths:
M archive/entries/2016-04-05-1.xml

Diff:
diff --git a/archive/entries/2016-04-05-1.xml b/archive/entries/2016-04-05-1.xml
index 3ea9025..4ebe74c 100644
--- a/archive/entries/2016-04-05-1.xml
+++ b/archive/entries/2016-04-05-1.xml
@@ -1,4 +1,3 @@

com web/php: midwest image name: archive/entries/2016-02-16-1.xml

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=7ce66174b1a6afafb2d36d9abc086043ff248413" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=7ce66174b1a6afafb2d36d9abc086043ff248413">http://git.php.net/?p=web/php.git;a=commitdiff;h=7ce66174b1a6afafb2d36d9...</a>

Log:
midwest image name

Changed paths:
M archive/entries/2016-02-16-1.xml

Diff:
diff --git a/archive/entries/2016-02-16-1.xml b/archive/entries/2016-02-16-1.xml
index aa732a5..4f9e894 100644
--- a/archive/entries/2016-02-16-1.xml
+++ b/archive/entries/2016-02-16-1.xml
@@ -8,8 +8,7 @@
<category term="conferences" label="Conference announcement"/>
<link href="http://php.net/conferences/index.php#id2016-02-16-1" rel="alternate" type="text/html"/>
<default:newsImage xmlns="ht

PhpStorm Open Source Licenses 2015/16

Hi folks,

It's that time of year again. If you are using our PhpStorm license, you've
probably been prompted about it expiring in December. JetBrains have
kindly offered their open source license to us again, and as usual all
details are on the wiki*.

<a href="https://wiki.php.net/licenses/jetbrains/phpstorm" title="https://wiki.php.net/licenses/jetbrains/phpstorm">https://wiki.php.net/licenses/jetbrains/phpstorm</a>

Cheers,

Peter

* As always, please do not pass on any information that is on that wiki
page.

com web/php: update update date: archive/entries/2015-09-15-1.xml

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=3650b2a6571cda455334f49f2b9f173f823ae3c5" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=3650b2a6571cda455334f49f2b9f173f823ae3c5">http://git.php.net/?p=web/php.git;a=commitdiff;h=3650b2a6571cda455334f49...</a>

Log:
update update date

Changed paths:
M archive/entries/2015-09-15-1.xml

Diff:
diff --git a/archive/entries/2015-09-15-1.xml b/archive/entries/2015-09-15-1.xml
index 1993c64..53225ed 100644
--- a/archive/entries/2015-09-15-1.xml
+++ b/archive/entries/2015-09-15-1.xml
@@ -3,7 +3,7 @@
<title>PHPConf Taiwan 2015</title>
<id>http://php.net/archive/2015.php#id2015-09-15-1</id>
<published>2015-09-15T16:25:12+00:00</published>
- <updated>2015-09-15T16:25:12+00:00</updated>
+ <updat

com web/php: Modify the content for PHPConf Taiwan 2015.: archive/entries/2015-09-15-1.xml

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=5e638e5838d57442389e662b6d8bd209ad99e5fd" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=5e638e5838d57442389e662b6d8bd209ad99e5fd">http://git.php.net/?p=web/php.git;a=commitdiff;h=5e638e5838d57442389e662...</a>

Log:
Modify the content for PHPConf Taiwan 2015.

Changed paths:
M archive/entries/2015-09-15-1.xml

Diff:
diff --git a/archive/entries/2015-09-15-1.xml b/archive/entries/2015-09-15-1.xml
index 1d3a6a7..1993c64 100644
--- a/archive/entries/2015-09-15-1.xml
+++ b/archive/entries/2015-09-15-1.xml
@@ -11,9 +11,8 @@
<link href="http://2015.phpconf.tw" rel="via" type="text/html"/>
<content type="xhtml">
<div xmlns="http://www.w3.org/1999/xhtml">
- We are honored to announce <a h

com web/php: fix __debugInfo() redirect (bug #69918): error.php

Link: <a href="http://git.php.net/?p=web/php.git;a=commitdiff;h=f496b51562244d5b110115952ed2905ec912f03c" title="http://git.php.net/?p=web/php.git;a=commitdiff;h=f496b51562244d5b110115952ed2905ec912f03c">http://git.php.net/?p=web/php.git;a=commitdiff;h=f496b51562244d5b1101159...</a>

Log:
fix __debugInfo() redirect (bug #69918)

Bugs:
<a href="https://bugs.php.net/69918" title="https://bugs.php.net/69918">https://bugs.php.net/69918</a>

Changed paths:
M error.php

Diff:
diff --git a/error.php b/error.php
index 8eb7ab7..5e221a8 100644
--- a/error.php
+++ b/error.php
@@ -376,7 +376,6 @@ $uri_aliases = array (
"__destruct" => "language.oop5.decon",
"__call" => "language.oop5.overloading",
"__callstatic" => "language.oop5.overloading",
- "__debuginfo" => "language.oop5.overloading",
"__get" => "language.oop5