RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-18 06:21:40 +03:00
Code Issues Projects Releases Wiki Activity

removed aditional ?> from lib

Browse Source
This commit is contained in:
meus 2007-09-02 17:00:26 +00:00
parent d08f492656
commit 4ff9af6df0
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Doctrine.php
View File

@ -546,4 +546,3 @@ final class Doctrine
return true; return true;
} }
} }
?>

30
lib/Doctrine/Lib.php
View File

@ -86,16 +86,16 @@ class Doctrine_Lib
public static function getCollectionAsXml(Doctrine_Collection $collection, SimpleXMLElement $incomming_xml = null){ public static function getCollectionAsXml(Doctrine_Collection $collection, SimpleXMLElement $incomming_xml = null){
$collectionName = Doctrine_Lib::plurelize($collection->getTable()->tableName); $collectionName = Doctrine_Lib::plurelize($collection->getTable()->tableName);
if ( $collection->count != 0) { if ( $collection->count != 0) {
$record = $collection[0]; $record = $collection[0];
$xml_options = $record->option("xml"); $xml_options = $record->option("xml");
if ( isset($xml_options["collection_name"])) { if ( isset($xml_options["collection_name"])) {
$collectionName = $xml_options["collection_name"]; $collectionName = $xml_options["collection_name"];
} }
} }
if ( ! isset($incomming_xml)) { if ( ! isset($incomming_xml)) {
$new_xml_string = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?><" . $collectionName . "></" . $collectionName . ">"; $new_xml_string = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?><" . $collectionName . "></" . $collectionName . ">";
$xml = new SimpleXMLElement($new_xml_string); $xml = new SimpleXMLElement($new_xml_string);
} else { } else {
$xml = $incomming_xml->addChild($collectionName); $xml = $incomming_xml->addChild($collectionName);
@ -129,18 +129,18 @@ class Doctrine_Lib
{ {
$recordname = $record->getTable()->tableName; $recordname = $record->getTable()->tableName;
if ( !isset($incomming_xml)) { if ( !isset($incomming_xml)) {
$new_xml_string = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?><" . $recordname . "></" . $recordname . ">"; $new_xml_string = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?><" . $recordname . "></" . $recordname . ">";
$xml = new SimpleXMLElement($new_xml_string); $xml = new SimpleXMLElement($new_xml_string);
}else{ }else{
$xml = $incomming_xml->addChild($recordname); $xml = $incomming_xml->addChild($recordname);
} }
foreach($record->obtainIdentifier() as $pk_field => $pk_value){ foreach($record->obtainIdentifier() as $pk_field => $pk_value){
$xml->addChild($pk_field,$pk_value); $xml->addChild($pk_field,$pk_value);
} }
$xml_options = $record->option("xml"); $xml_options = $record->option("xml");
if ( isset($xml_options["record_name"])) { if ( isset($xml_options["record_name"])) {
$recordname = $xml_options["record_name"]; $recordname = $xml_options["record_name"];
} }
foreach ($record->getData() as $field => $value) { foreach ($record->getData() as $field => $value) {
if ((isset($xml_options["ignore_fields"]) && !in_array($field, $xml_options["ignore_fields"])) || !isset($xml_options["ignore_fields"])) { if ((isset($xml_options["ignore_fields"]) && !in_array($field, $xml_options["ignore_fields"])) || !isset($xml_options["ignore_fields"])) {
if ($value instanceOf Doctrine_Null) { if ($value instanceOf Doctrine_Null) {