[small patch] pear/Config/Config/Container/(xml|db).php

Currently they give a warning of not having ->allowed_options when calling ->setFeatures. Since all containers right now define available options anyway with decent defaults in ->features we can safely pass array_keys( $this->features) to ->setFeatures. comments ? - Markus -- Markus Fischer, http://guru.josefine.at/~mfischer/ EMail: mfischer@guru.josefine.at PGP Public Key: http://guru.josefine.at/~mfischer/C2272BD0.asc PGP Fingerprint: D3B0 DD4F E12B F911 3CE1 C2B5 D674 B445 C227 2BD0

? remve_allowed.patch Index: db.php =================================================================== RCS file: /repository/pear/Config/Config/Container/db.php,v retrieving revision 1.1 diff -u -r1.1 db.php --- db.php 31 Jul 2001 10:51:03 -0000 1.1 +++ db.php 10 Aug 2001 13:35:38 -0000 @@ -109,7 +109,7 @@ function parseInput( $datasrc = "", $feature = array( ) ) { - $this->setFeatures($feature, array_merge($this->allowed_options,array("Table"))); + $this->setFeatures($feature, array_keys($this->feature)); $query = "SELECT block,name,value from ".$this->feature["Table"]." where datasrc = '$datasrc'"; $res = $this->db->query($query); @@ -172,4 +172,4 @@ } } } -?> \ No newline at end of file +?> Index: xml.php =================================================================== RCS file: /repository/pear/Config/Config/Container/xml.php,v retrieving revision 1.1 diff -u -r1.1 xml.php --- xml.php 31 Jul 2001 10:51:03 -0000 1.1 +++ xml.php 10 Aug 2001 13:35:41 -0000 @@ -60,7 +60,7 @@ { $this -> datasrc = $datasrc ; - $this->setFeatures($feature, array_merge($this->allowed_options, array('IncludeContent', 'MasterAttribute','IncludeMasterAttribute','IncludeChildren'))); + $this->setFeatures($feature, array_keys($this->feature)); if( file_exists( $datasrc ) ) { $xml = xmldocfile($datasrc);