Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[16517] trunk

[Marc L. <ma...@ma...>]

Hi!

This commit provokes this error on my server (Dreamhost)

Fatal error: Cannot redeclare _pear_call_destructors() (previously
declared in /usr/local/php5/lib/php/PEAR.php:775) in lib/pear/PEAR.php
on line 806

Any idea?

Thanks!

M ;-)


On Tue, Feb 3, 2009 at 11:06 PM,  <ad...@us...> wrote:
> Revision: 16517
>          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=16517&view=rev
> Author:   adren67
> Date:     2009-02-03 22:06:34 +0000 (Tue, 03 Feb 2009)
>
> Log Message:
> -----------
> force full path for require_once to comply with strict ISP (namely free.fr)
> that forbids set_include_path and ini_set among others
> remove prependIncludePath and appendIncludePath which are not used anymore
>
> Modified Paths:
> --------------
>    trunk/db/tiki-db-adodb.php
>    trunk/installer/shell.php
>    trunk/installer/tiki-installer.php
>    trunk/lib/init/initlib.php
>    trunk/tiki-filter-base.php
>
> Modified: trunk/db/tiki-db-adodb.php
> ===================================================================
> --- trunk/db/tiki-db-adodb.php  2009-02-03 21:53:10 UTC (rev 16516)
> +++ trunk/db/tiki-db-adodb.php  2009-02-03 22:06:34 UTC (rev 16517)
> @@ -7,10 +7,6 @@
>  }
>
>  if (preg_match('/^adodb$/i', $api_tiki)) {
> -       TikiInit::prependIncludePath('lib/adodb');
> -       if (strpos(ini_get('include_path'),'lib/pear') !== 0)
> -               TikiInit::prependIncludePath('lib/pear');
> -
>        define('ADODB_FORCE_NULLS', 1);
>        define('ADODB_ASSOC_CASE', 2);
>        define('ADODB_CASE_ASSOC', 2); // typo in adodb's driver for sybase?
>
> Modified: trunk/installer/shell.php
> ===================================================================
> --- trunk/installer/shell.php   2009-02-03 21:53:10 UTC (rev 16516)
> +++ trunk/installer/shell.php   2009-02-03 22:06:34 UTC (rev 16517)
> @@ -11,9 +11,6 @@
>
>  require_once('lib/init/initlib.php');
>  require_once('lib/setup/tikisetup.class.php');
> -TikiSetup::prependIncludePath($tikipath);
> -TikiSetup::prependIncludePath('lib');
> -TikiSetup::prependIncludePath('lib/pear');
>  require_once('tiki-setup_base.php');
>  require_once('installer/installlib.php');
>  include $local_php;
>
> Modified: trunk/installer/tiki-installer.php
> ===================================================================
> --- trunk/installer/tiki-installer.php  2009-02-03 21:53:10 UTC (rev 16516)
> +++ trunk/installer/tiki-installer.php  2009-02-03 22:06:34 UTC (rev 16517)
> @@ -590,8 +590,6 @@
>  //   then get con or nocon
>
>  //adodb settings
> -TikiInit::prependIncludePath('lib/adodb');
> -TikiInit::prependIncludePath('lib/pear');
>
>  define('ADODB_FORCE_NULLS', 1);
>  define('ADODB_ASSOC_CASE', 2);
>
> Modified: trunk/lib/init/initlib.php
> ===================================================================
> --- trunk/lib/init/initlib.php  2009-02-03 21:53:10 UTC (rev 16516)
> +++ trunk/lib/init/initlib.php  2009-02-03 22:06:34 UTC (rev 16517)
> @@ -56,40 +56,6 @@
>        }
>
>
> -/** Prepend $path to the include path
> -  * \static
> -  */
> -       function prependIncludePath($path) {
> -               $include_path = ini_get('include_path');
> -               if ($include_path) {
> -                       $include_path = $path . TikiInit::pathSeparator(). $include_path;
> -               } else {
> -                       $include_path = $path;
> -               }
> -               if (phpversion() >= '4.3')
> -                       return set_include_path ($include_path);
> -               else
> -                       return ini_set('include_path', $include_path);
> -       }
> -
> -
> -/** Append $path to the include path
> -  * \static
> -  */
> -       function appendIncludePath($path) {
> -               $include_path = ini_get('include_path');
> -               if ($include_path) {
> -                       $include_path .= TikiInit::pathSeparator(). $path;
> -               } else {
> -                       $include_path = $path;
> -               }
> -               if (phpversion() >= '4.3')
> -                       return set_include_path ($include_path);
> -               else
> -                       return ini_set('include_path', $include_path);
> -       }
> -
> -
>  /** Return system defined temporary directory.
>   * In Unix, this is usually /tmp
>   * In Windows, this is usually c:\windows\temp or c:\winnt\temp
>
> Modified: trunk/tiki-filter-base.php
> ===================================================================
> --- trunk/tiki-filter-base.php  2009-02-03 21:53:10 UTC (rev 16516)
> +++ trunk/tiki-filter-base.php  2009-02-03 22:06:34 UTC (rev 16517)
> @@ -41,12 +41,7 @@
>  if ( substr($tikipath,-1,1) != '/' ) $tikipath .= '/';
>
>  require_once('lib/init/initlib.php');
> -TikiInit::prependIncludePath($tikipath);
> -TikiInit::prependIncludePath($tikipath.'lib');
> -TikiInit::prependIncludePath($tikipath.'lib/pear');
> -TikiInit::prependIncludePath($tikipath.'lib/core/lib');
> +require_once('lib/core/lib/DeclFilter.php');
> +require_once('lib/core/lib/JitFilter.php');
>
> -require_once 'DeclFilter.php';
> -require_once 'JitFilter.php';
> -
>  ?>
>
>
> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
>
> ------------------------------------------------------------------------------
> Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM)
> software. With Adobe AIR, Ajax developers can use existing skills and code to
> build responsive, highly engaging applications that combine the power of local
> resources and data with the reach of the web. Download the Adobe AIR SDK and
> Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com
> _______________________________________________
> Tikiwiki-cvs mailing list
> Tik...@li...
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs
>



-- 
Marc Laporte

http://MarcLaporte.com
http://TikiWiki.org/MarcLaporte
http://AvanTech.net
http://OurWiki.net