From ccefaf48ebed8e45567f97a463b24f07992886e9 Mon Sep 17 00:00:00 2001
From: rurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Mon, 28 Feb 2005 21:24:34 +0000
Subject: [PATCH] ignore forbidden ini_set warnings. Bug #1117254 by Xavier
 Roche

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@4627 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/FileFinder.php                           | 13 ++++++++++---
 lib/IniConfig.php                            | 11 +++++++----
 lib/WikiDB/adodb/drivers/adodb-mssql.inc.php |  2 +-
 lib/main.php                                 |  7 +++++--
 lib/pear/DB/sqlite.php                       |  6 +++---
 lib/pear/PEAR.php                            |  4 ++--
 lib/plugin/PageTrail.php                     |  7 +++++--
 7 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/lib/FileFinder.php b/lib/FileFinder.php
index be39e6ae7..5ea49486d 100644
--- a/lib/FileFinder.php
+++ b/lib/FileFinder.php
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id: FileFinder.php,v 1.30 2004-11-10 19:32:21 rurban Exp $');
+<?php rcs_id('$Id: FileFinder.php,v 1.31 2005-02-28 21:24:32 rurban Exp $');
 
 require_once(dirname(__FILE__).'/stdlib.php');
 
@@ -274,7 +274,7 @@ class FileFinder
          * This following line should be in the above if-block, but we
          * put it here, as it seems to work-around the bug.
          */
-        ini_set('include_path', implode($this->_get_ini_separator(), $this->_path));
+        @ini_set('include_path', implode($this->_get_ini_separator(), $this->_path));
     }
 
     /**
@@ -292,7 +292,7 @@ class FileFinder
             array_splice($this->_path, $i, 1);
         }
         array_unshift($this->_path, $dir);
-        ini_set('include_path', implode($this->_path, $this->_get_ini_separator()));
+        @ini_set('include_path', implode($this->_path, $this->_get_ini_separator()));
     }
 
     // Return all the possible shortened locale specifiers for the given locale.
@@ -587,6 +587,13 @@ function isCygwin() {
 }
 
 // $Log: not supported by cvs2svn $
+// Revision 1.30  2004/11/10 19:32:21  rurban
+// * optimize increaseHitCount, esp. for mysql.
+// * prepend dirs to the include_path (phpwiki_dir for faster searches)
+// * Pear_DB version logic (awful but needed)
+// * fix broken ADODB quote
+// * _extract_page_data simplification
+//
 // Revision 1.29  2004/11/09 17:11:03  rurban
 // * revert to the wikidb ref passing. there's no memory abuse there.
 // * use new wikidb->_cache->_id_cache[] instead of wikidb->_iwpcache, to effectively
diff --git a/lib/IniConfig.php b/lib/IniConfig.php
index 858ab8ded..f2ae37f18 100644
--- a/lib/IniConfig.php
+++ b/lib/IniConfig.php
@@ -1,5 +1,5 @@
 <?php
-rcs_id('$Id: IniConfig.php,v 1.82 2005-02-28 20:14:19 rurban Exp $');
+rcs_id('$Id: IniConfig.php,v 1.83 2005-02-28 21:24:32 rurban Exp $');
 
 /**
  * A configurator intended to read its config from a PHP-style INI file,
@@ -454,7 +454,7 @@ function IniConfig($file) {
         $rs['PLUGIN_CACHED_CACHE_DIR'] = $rsdef['PLUGIN_CACHED_CACHE_DIR'];
     if (empty($rs['PLUGIN_CACHED_CACHE_DIR'])) {
         if (!empty($rs['INCLUDE_PATH'])) {
-            ini_set('include_path', $rs['INCLUDE_PATH']);
+            @ini_set('include_path', $rs['INCLUDE_PATH']);
         }
         if (!FindFile('/tmp/cache', 1)) { // [29ms]
             if (!FindFile('/tmp', 1)) {
@@ -639,9 +639,9 @@ function fixup_dynamic_configs($file) {
     global $HTTP_SERVER_VARS, $DBParams, $LANG;
 
     if (defined('INCLUDE_PATH'))
-        ini_set('include_path', INCLUDE_PATH);
+        @ini_set('include_path', INCLUDE_PATH);
     if (defined('SESSION_SAVE_PATH'))
-        ini_set('session.save_path', SESSION_SAVE_PATH);
+        @ini_set('session.save_path', SESSION_SAVE_PATH);
     if (!defined('DEFAULT_LANGUAGE'))   // not needed anymore
         define('DEFAULT_LANGUAGE', ''); // detect from client
 
@@ -830,6 +830,9 @@ function fixup_dynamic_configs($file) {
 }
 
 // $Log: not supported by cvs2svn $
+// Revision 1.82  2005/02/28 20:14:19  rurban
+// prevent from recursion (configurator.php)
+//
 // Revision 1.81  2005/02/27 13:20:28  rurban
 // remove clsclient (typo and still exp)
 //
diff --git a/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php b/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
index 5bdde0269..d92d20c21 100644
--- a/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
@@ -36,7 +36,7 @@ Set tabs to 4 for best viewing.
 // has datetime converstion to YYYY-MM-DD format, and also mssql_fetch_assoc
 if (ADODB_PHPVER >= 0x4300) {
 // docs say 4.2.0, but testing shows only since 4.3.0 does it work!
-	ini_set('mssql.datetimeconvert',0); 
+	@ini_set('mssql.datetimeconvert',0); 
 } else {
 global $ADODB_mssql_mths;		// array, months must be upper-case
 
diff --git a/lib/main.php b/lib/main.php
index 01c3ca9e5..b282f9b4c 100644
--- a/lib/main.php
+++ b/lib/main.php
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-rcs_id('$Id: main.php,v 1.207 2005-02-10 19:03:37 rurban Exp $');
+rcs_id('$Id: main.php,v 1.208 2005-02-28 21:24:32 rurban Exp $');
 /*
  Copyright 1999,2000,2001,2002,2004,2005 $ThePhpWikiProgrammingTeam
 
@@ -1142,7 +1142,7 @@ function validateSessionPath() {
                  , E_USER_NOTICE);
         }
         else
-            ini_set('session.save_path', $tmpdir);
+            @ini_set('session.save_path', $tmpdir);
     }
 }
 
@@ -1237,6 +1237,9 @@ if (!defined('PHPWIKI_NOMAIN') or !PHPWIKI_NOMAIN)
 
 
 // $Log: not supported by cvs2svn $
+// Revision 1.207  2005/02/10 19:03:37  rurban
+// try to avoid duoplicate lang/theme init
+//
 // Revision 1.206  2005/02/04 11:30:10  rurban
 // remove old comments
 //
diff --git a/lib/pear/DB/sqlite.php b/lib/pear/DB/sqlite.php
index 7ede93109..24d3036c5 100644
--- a/lib/pear/DB/sqlite.php
+++ b/lib/pear/DB/sqlite.php
@@ -18,7 +18,7 @@
 // | Maintainer: Daniel Convissor <danielc@php.net>                       |
 // +----------------------------------------------------------------------+
 //
-// $Id: sqlite.php,v 1.4 2004-06-21 08:39:38 rurban Exp $
+// $Id: sqlite.php,v 1.5 2005-02-28 21:24:33 rurban Exp $
 
 require_once 'DB/common.php';
 
@@ -27,7 +27,7 @@ require_once 'DB/common.php';
  * PECL extension.
  *
  * @package  DB
- * @version  $Id: sqlite.php,v 1.4 2004-06-21 08:39:38 rurban Exp $
+ * @version  $Id: sqlite.php,v 1.5 2005-02-28 21:24:33 rurban Exp $
  * @category Database
  * @author   Urs Gehrig <urs@circle.ch>
  * @author   Mika Tuupola <tuupola@appelsiini.net>
@@ -185,7 +185,7 @@ class DB_sqlite extends DB_common
         $ismanip = DB::isManip($query);
         $this->last_query = $query;
         $query = $this->_modifyQuery($query);
-        ini_set('track_errors', true);
+        @ini_set('track_errors', true);
         $result = @sqlite_query($query, $this->connection);
         ini_restore('track_errors');
         $this->_lasterror = isset($php_errormsg) ? $php_errormsg : '';
diff --git a/lib/pear/PEAR.php b/lib/pear/PEAR.php
index 487e0d64d..bd6eed6ab 100644
--- a/lib/pear/PEAR.php
+++ b/lib/pear/PEAR.php
@@ -18,7 +18,7 @@
 // |          Tomas V.V.Cox <cox@idecnet.com>                             |
 // +----------------------------------------------------------------------+
 //
-rcs_id('$Id: PEAR.php,v 1.4 2004-06-21 08:39:37 rurban Exp $');
+rcs_id('$Id: PEAR.php,v 1.5 2005-02-28 21:24:33 rurban Exp $');
 rcs_id('From Pear CVS: Id: PEAR.php,v 1.59 2003/04/03 23:10:10 ssb Exp');
 //
 
@@ -47,7 +47,7 @@ $GLOBALS['_PEAR_destructor_object_list'] = array();
 $GLOBALS['_PEAR_shutdown_funcs']         = array();
 $GLOBALS['_PEAR_error_handler_stack']    = array();
 
-ini_set('track_errors', true);
+@ini_set('track_errors', true);
 
 /**
  * Base class for other PEAR classes.  Provides rudimentary
diff --git a/lib/plugin/PageTrail.php b/lib/plugin/PageTrail.php
index 3a81a077c..11a98601e 100644
--- a/lib/plugin/PageTrail.php
+++ b/lib/plugin/PageTrail.php
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: PageTrail.php,v 1.6 2005-02-27 21:34:10 rurban Exp $');
+rcs_id('$Id: PageTrail.php,v 1.7 2005-02-28 21:24:34 rurban Exp $');
 /**
  Copyright 1999,2000,2001,2002,2005 $ThePhpWikiProgrammingTeam
 
@@ -52,7 +52,7 @@ extends WikiPlugin
 
     function getVersion() {
         return preg_replace("/[Revision: $]/", '',
-                            "\$Revision: 1.6 $");
+                            "\$Revision: 1.7 $");
     }
 
     // default values
@@ -95,6 +95,9 @@ extends WikiPlugin
 };
 
 // $Log: not supported by cvs2svn $
+// Revision 1.6  2005/02/27 21:34:10  rurban
+// Fix error with : in pagenames. Thanks to Dan Frankowski. bug #1115479
+//
 // Revision 1.5  2005/02/02 19:38:42  rurban
 // shorter default trail
 //
-- 
2.45.0