Menu
▾
▴
Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[20942] trunk
|
From: Sylvie G. <sgr...@gm...> - 2009-09-14 16:55:36
|
+1, seems nyloth proposal is fafier
On Mon, 2009-09-14 at 17:10 +0200, Nyloth wrote:
> Hi Chealer,
>
> Ok... so if I understand your explanation, your fix supposes that
> smarty will be able to auto-detect the SMARTY_DIR correctly in every
> cases when using the smarty included in Tiki.
>
> I did not check this auto-detection, but I think it would have been
> less risky (and probably better in terms of performances) to change
> (in lib/setup/third_party.php) the default relative path into an
> absolute path, with something like this:
>
> * in lib/setup/third_party.php:
>
> -else define('SMARTY_DIR', 'lib/smarty/libs');
> +else define('SMARTY_DIR', $tikipath . '/lib/smarty/libs');
>
> * in tiki-setup.php
>
> -require_once 'lib/setup/third_party.php';
> require_once 'tiki-filter-base.php';
> +require_once 'lib/setup/third_party.php';
>
>
> What do you think ?
>
> ... but as Jonny (see message below if you are not subscribed to the
> CVS/SVN list), I think this could also wait for the next major
> version... Sylvie ?
>
> Cheers,
> Nyloth
>
> 2009/9/12 Jonny Bradley <tw...@no...>
>
> Hi Chealer
>
> But what does it actually fix? Just the {debug} thing? (which
> was
> broken since 3.0). This doesn't seem like the sort of
> essential
> "mission critical" fixes intended for the stable branch - if
> anyone
> knows how Smarty debug works (or should work) they could
> surely patch
> their own copy of tiki for that debugging - rather than
> risking some
> edge-case regression in this minor release?
>
> Cheers
>
> jonny
>
> Oh, and i wanted to say (off topic) well done with all the
> modules
> stuff - well played! :)
>
>
>
>
> On 11 Sep 2009, at 19:03, Filipus Klutiero wrote:
>
> > Hi Stéphane,
> > you are indeed missing something. lib/setup/third_party.php
> manages
> > the
> > definition of SMARTY_DIR, while setup_smarty.php only
> includes Smarty.
> > In Tiki 3.1, SMARTY_DIR is always defined by Tiki. If
> $smarty_path
> > isn't
> > defined (basically), then SMARTY_DIR is set to a relative
> path, which
> > was causing bug 2589 (at least).
> > In proposed, Tiki only defines SMARTY_DIR when $smarty_path
> is defined
> > (which basically means that we're using an external Smarty).
> >
> > The change in setup_smarty was required because the 3.1
> version
> > assumes
> > that SMARTY_DIR is defined - this is not always the case in
> the
> > proposed
> > third_party (until Smarty is included, which will take care
> to define
> > SMARTY_DIR automatically is it wasn't already defined).
> >
> > Marc Laporte a écrit :
> >> re-post for Chealer (who hasn't seen yet)
> >>
> >>
> >>
> >> On Tue, Aug 18, 2009 at 8:27 AM, Stephane Casset
> <se...@lo...>
> >> wrote:
> >>
> >>> Le Tue, Aug 18, 2009 at 03:33:57AM +0000,
> ch...@us...
> >>> écrivait :
> >>>
> >>>> Revision: 20942
> >>>>
> http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=20942&view=rev
> >>>> Author: chealer
> >>>> Date: 2009-08-18 03:33:57 +0000 (Tue, 18 Aug 2009)
> >>>>
> >>>> Log Message:
> >>>> -----------
> >>>> [FIX] SMARTY_DIR was set to a relative path by default
> >>>> Closes: 2589, smarty {debug} function gives PHP error
> >>>> "E_USER_WARNING"
> >>>>
> >>> I don't understand this commit, as it just move the
> declaration
> >>> from one
> >>> file to another, the patch doesn't seams to be what the
> >>> description is
> >>> :(
> >>>
> >>> Or I am missing something ?
> >>>
> >>>
> >>>> Modified Paths:
> >>>> --------------
> >>>> trunk/lib/setup/third_party.php
> >>>> trunk/setup_smarty.php
> >>>>
> >>>> Modified: trunk/lib/setup/third_party.php
> >>>>
> ===================================================================
> >>>> --- trunk/lib/setup/third_party.php 2009-08-18 01:26:56
> UTC
> >>>> (rev 20941)
> >>>> +++ trunk/lib/setup/third_party.php 2009-08-18 03:33:57
> UTC
> >>>> (rev 20942)
> >>>> @@ -14,7 +14,6 @@
> >>>> // The following constant is at least used in the
> release.php
> >>>> script and in the error handling functions
> >>>> define( 'THIRD_PARTY_LIBS_PATTERN', '#lib/(pear|ajax|
> adodb)#' );
> >>>>
> >>>> -// add a line like the following in db/local.php to use
> an
> >>>> external smarty installation:
> $smarty_path='/usr/share/php/smarty/'
> >>>> define('TIKI_SMARTY_DIR', 'lib/smarty_tiki/');
> >>>> +// add a line like the following in db/local.php to use
> an
> >>>> external smarty installation:
> $smarty_path='/usr/share/php/smarty/'
> >>>> if ( isset($smarty_path) && $smarty_path != '' &&
> >>>> file_exists($smarty_path.'Smarty.class.php') )
> >>>> define('SMARTY_DIR', $smarty_path);
> >>>> -else define('SMARTY_DIR', 'lib/smarty/libs/');
> >>>>
> >>> This line is somehow added in a different form in the file
> below...
> >>>
> >>>
> >>>> Modified: trunk/setup_smarty.php
> >>>>
> ===================================================================
> >>>> --- trunk/setup_smarty.php 2009-08-18 01:26:56 UTC
> (rev 20941)
> >>>> +++ trunk/setup_smarty.php 2009-08-18 03:33:57 UTC
> (rev 20942)
> >>>> @@ -13,7 +13,7 @@
> >>>> }
> >>>>
> >>>> require_once 'lib/setup/third_party.php';
> >>>> -require_once SMARTY_DIR.'Smarty.class.php';
> >>>> +require_once (defined(SMARTY_DIR) ? SMARTY_DIR :
> 'lib/smarty/
> >>>> libs/') . 'Smarty.class.php';
> >>>>
> >>>>
> >>> A+
> >>> --
> >>> Stéphane Casset LOGIDÉE sàrl Se faire
> plaisir
> >>> d'apprendre
> >>> 1a, rue Pasteur Tel : +33 388 23 69 77
> ca...@lo...
> >>> F-67540 OSTWALD Fax : +33 388 23 69 77
> http://logidee.com
> >
>
>
> >
> ------------------------------------------------------------------------------
> > Let Crystal Reports handle the reporting - Free Crystal
> Reports 2008
> > 30-Day
> > trial. Simplify your report design, integration and
> deployment - and
> > focus on
> > what you do best, core application coding. Discover what's
> new with
> > Crystal Reports now. http://p.sf.net/sfu/bobj-july
> > _______________________________________________
> > Tikiwiki-cvs mailing list
> > Tik...@li...
> > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs
>
>
> ------------------------------------------------------------------------------
> Let Crystal Reports handle the reporting - Free Crystal
> Reports 2008 30-Day
> trial. Simplify your report design, integration and deployment
> - and focus on
> what you do best, core application coding. Discover what's new
> with
> Crystal Reports now. http://p.sf.net/sfu/bobj-july
> _______________________________________________
> Tikiwiki-cvs mailing list
> Tik...@li...
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs
>
>
|