hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-15 05:53:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Dev' of github.com:alchemy-fr/Phraseanet into Dev

Browse Source
This commit is contained in:
Romain Neutron
2012-03-27 13:39:53 +02:00
parent a2554577f7 8d504605e6
commit e11ac4275e
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/classes/record/adapter.class.php
View File

@@ -1221,7 +1221,7 @@ class record_adapter implements record_Interface, cache_cacheableInterface
$this->caption_record = null;
$xml = new DOMDocument();
$xml->loadXML($this->get_caption()->serialize(\caption_record::SERIALIZE_XML));
$xml->loadXML($this->get_caption()->serialize(\caption_record::SERIALIZE_XML, true));
$this->set_xml($xml);
$this->reindex();

9
www/testextension3.php
View File

@@ -433,10 +433,15 @@ if($ph_session)
else
$code .= "\t\t\t, '' \t\t// no sort \n" ;
// if($parm['businessfields'])
// $code .= "\t\t\t, TRUE \t\t// search on business fields \n" ;
// else
// $code .= "\t\t\t, FALSE \t\t// do not search on business fields \n" ;
if($parm['businessfields'])
$code .= "\t\t\t, TRUE \t\t// search on business fields \n" ;
$code .= "\t\t\t," . my_var_export($base["searchcoll"]) . "\t\t// search on business fields \n" ;
else
$code .= "\t\t\t, FALSE \t\t// do not search on business fields \n" ;
$code .= "\t\t\t, array() \t\t// do not search on business fields \n" ;
$code .= "\t\t);" ;