pushed & built on the test server
On Wed, Jul 23, 2014 at 3:20 PM, Vlad <vlad@r.o.psiphon.ca> wrote:
> Vlad has proposed merging lp:~t7-vla7-lz/psiphon/psiphon into lp:psiphon. > > Requested reviews: > Psiphon Inc. (psiphon-inc) > > For more details, see: > https://code.launchpad.net/~t7-vla7-lz/psiphon/psiphon/+merge/227982 > > www/psiphon3/www/index.php: stats date format updated from integer to > "yyyy-mm-dd" > -- > https://code.launchpad.net/~t7-vla7-lz/psiphon/psiphon/+merge/227982 > Your team Psiphon Inc. is requested to review the proposed merge of > lp:~t7-vla7-lz/psiphon/psiphon into lp:psiphon. > > === modified file 'trunk/www/psiphon3/www/index.php' > --- trunk/www/psiphon3/www/index.php 2011-09-08 18:35:50 +0000 > +++ trunk/www/psiphon3/www/index.php 2014-07-23 19:19:22 +0000 > @@ -63,7 +63,7 @@ > > $region = lookup_region($config); > $proxy_id = $proxy_record['id']; > - $date = mktime(0, 0, 1, date("m"), date("j"), date("Y")); > + $date = strftime("%Y-%m-%d"); > > $params = convert_null_array(array( > ":date" => $date, > > >
« Back to merge proposal
pushed & built on the test server
On Wed, Jul 23, 2014 at 3:20 PM, Vlad <vlad@r. o.psiphon. ca> wrote:
> Vlad has proposed merging lp:~t7-vla7-lz/psiphon/psiphon into lp:psiphon. /code.launchpad .net/~t7- vla7-lz/ psiphon/ psiphon/ +merge/ 227982 www/index. php: stats date format updated from integer to /code.launchpad .net/~t7- vla7-lz/ psiphon/ psiphon/ +merge/ 227982 www/psiphon3/ www/index. php' psiphon3/ www/index. php 2011-09-08 18:35:50 +0000 psiphon3/ www/index. php 2014-07-23 19:19:22 +0000 region( $config) ; record[ 'id']; "%Y-%m- %d"); null_array( array(
>
> Requested reviews:
> Psiphon Inc. (psiphon-inc)
>
> For more details, see:
> https:/
>
> www/psiphon3/
> "yyyy-mm-dd"
> --
> https:/
> Your team Psiphon Inc. is requested to review the proposed merge of
> lp:~t7-vla7-lz/psiphon/psiphon into lp:psiphon.
>
> === modified file 'trunk/
> --- trunk/www/
> +++ trunk/www/
> @@ -63,7 +63,7 @@
>
> $region = lookup_
> $proxy_id = $proxy_
> - $date = mktime(0, 0, 1, date("m"), date("j"), date("Y"));
> + $date = strftime(
>
> $params = convert_
> ":date" => $date,
>
>
>