[pLog-svn] r5490 - plog/trunk

[Mark Wu]

I notice that, too. It seems the wizard.php does not merge from trunk since
rev 5158 ... :(

I just revert it to 5158, and re-merge it from 1.2 branch (from 5158 to
5491)

Mark

> -----Original Message-----
> From: plog-svn-bounces at devel.lifetype.net 
> [mailto:plog-svn-bounces at devel.lifetype.net] On Behalf Of 
> Oscar Renalias
> Sent: Wednesday, June 06, 2007 1:49 AM
> To: plog-svn at devel.lifetype.net
> Subject: Re: [pLog-svn] r5490 - plog/trunk
> 
> This won't work:
> 
> > -    include_once( PLOG_CLASS_PATH."install/ 
> > dbschemas.properties.php" );
> > +    lt_include( 
> PLOG_CLASS_PATH."install/dbschemas.properties.php" );
> >      // default configuration values for 1.1
> > -    include_once( PLOG_CLASS_PATH."install/ 
> > defaultconfig.properties.php" );
> > +    lt_include( PLOG_CLASS_PATH."install/
> > defaultconfig.properties.php" );
> >      // post schema changes after upgrade
> > -    include_once( PLOG_CLASS_PATH."install/ 
> > changes_10_11.properties.php" );
> > +    lt_include( PLOG_CLASS_PATH."install/
> > changes_10_11.properties.php" );
> 
> Using lt_include to import a .php file which defined an array 
> instead  
> of a class did not work, so they had to be kept as include() or  
> include_once().
> 
> But if you had merged wizard.php from lifetype-1.2 to the one in  
> trunk/ you wouldn't have needed this. I suppose you forgot about  
> wizard.php... But I think we can take the easy route and copy the  
> wizard over from the lifetype-1.2 branch, as the one in the trunk/  
> was not special for the branch anyway.
> 
> Oscar
> _______________________________________________
> pLog-svn mailing list
> pLog-svn at devel.lifetype.net
> http://limedaley.com/mailman/listinfo/plog-svn
>