Re: [PHP-WEBMASTER] com web/php: Merge branch 'pull-request/68': js/common.js

Peter Cowburn wrote: > On 24 June 2015 at 03:25, Hannes Magnusson > wrote: > >> This looks like a bad merge. Are you sure everything is OK? > > *shrug* I have no idea why Git shows the merge like that. However, the > file looks okay to me. The Github diff looks also rather different:

Re: [PHP-WEBMASTER] com web/php: Merge branch 'pull-request/68': js/common.js

On 24 June 2015 at 03:25, Hannes Magnusson wrote: > This looks like a bad merge. Are you sure everything is OK? > *shrug* I have no idea why Git shows the merge like that. However, the file looks okay to me. > > -Hannes > > > On Tue, Jun 23, 2015 at 3:39 PM, Peter Cowburn wrote: > > Commit:

[PHP-WEBMASTER] com web/php: Add 5.5 EOL date block, per internals.: include/branches.inc

Commit:c23428514874bc5868f1df0fe6b45e83e7c6ceb8 Author:Adam Harvey Wed, 24 Jun 2015 10:03:19 -0700 Parents: f496b51562244d5b110115952ed2905ec912f03c Branches: master Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=c23428514874bc5868f1df0fe6b45e83e7c6ceb8 Log: Add

[PHP-WEBMASTER] function reserved word.

Hello, According to php language syntax, a class method declaration should contain the reserved word "function". Example: class myClass { Public function myFunction(){}; } This issue is probably related to previous versions where php does not support objects yet. However, I wonder why php do

[PHP-WEBMASTER] International PHP Conference 2015 listing

Dear PHP.net Team, please add our International PHP Conference 2015 to the upcoming conferences. You can find all informations downwards. Attached is also a logo for your website. International PHP Conference 2015 The International PHP Conference is the worl

[PHP-WEBMASTER] Bug #69918 [Csd]: http://php.net/__debugInfo goes to wrong page

Edit report at https://bugs.php.net/bug.php?id=69918&edit=1 ID: 69918 Updated by: sala...@php.net Reported by:php-bugs at allenjb dot me dot uk Summary:http://php.net/__debugInfo goes to wrong page Status: Closed Type: Bug

[PHP-WEBMASTER] Bug #69918 [Opn->Csd]: http://php.net/__debugInfo goes to wrong page

Edit report at https://bugs.php.net/bug.php?id=69918&edit=1 ID: 69918 Updated by: sala...@php.net Reported by:php-bugs at allenjb dot me dot uk Summary:http://php.net/__debugInfo goes to wrong page -Status: Open +Status: Close

[PHP-WEBMASTER] com web/php: fix __debugInfo() redirect (bug #69918): error.php

Commit:f496b51562244d5b110115952ed2905ec912f03c Author:Peter Cowburn Wed, 24 Jun 2015 13:58:53 +0100 Parents: 05e649de95d16dba1884f15bf74cac74258a5cd0 Branches: master Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=f496b51562244d5b110115952ed2905ec912f03c Log:

[PHP-WEBMASTER] com web/php: fix entry id: archive/entries/2015-06-11-3.xml

Commit:05e649de95d16dba1884f15bf74cac74258a5cd0 Author:Anatol Belski Wed, 24 Jun 2015 11:55:26 +0200 Parents: cdad7277b2eb278990c1153a64b53d99e474d7b6 Branches: master Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=05e649de95d16dba1884f15bf74cac74258a5cd0 Log: f