#1386 fixed
This commit is contained in:
parent
f4c0454b0c
commit
4750fba2c4
1 changed files with 8 additions and 0 deletions
|
@ -249,6 +249,7 @@ class MetaData{
|
||||||
$parname = ($parns ? "$parns:" : '').$parname;
|
$parname = ($parns ? "$parns:" : '').$parname;
|
||||||
$category = ($chns ? "$chns:" : '').$chname;
|
$category = ($chns ? "$chns:" : '').$chname;
|
||||||
$r = $this->validateOneValue($parname, $category, $predxml, $value);
|
$r = $this->validateOneValue($parname, $category, $predxml, $value);
|
||||||
|
foreach(array('value') as $v) $$v = addslashes($$v);
|
||||||
if(PEAR::isError($r)) return $r;
|
if(PEAR::isError($r)) return $r;
|
||||||
if(!is_null($value)){
|
if(!is_null($value)){
|
||||||
$sql = "
|
$sql = "
|
||||||
|
@ -645,6 +646,7 @@ class MetaData{
|
||||||
*/
|
*/
|
||||||
function updateRecord($mdid, $object, $objns='_L')
|
function updateRecord($mdid, $object, $objns='_L')
|
||||||
{
|
{
|
||||||
|
foreach(array('objns', 'object') as $v) $$v = addslashes($$v);
|
||||||
$objns_sql = (is_null($objns) ? "NULL" : "'$objns'" );
|
$objns_sql = (is_null($objns) ? "NULL" : "'$objns'" );
|
||||||
$object_sql = (is_null($object)? "NULL" : "'$object'");
|
$object_sql = (is_null($object)? "NULL" : "'$object'");
|
||||||
$res = $this->dbc->query("UPDATE {$this->mdataTable}
|
$res = $this->dbc->query("UPDATE {$this->mdataTable}
|
||||||
|
@ -676,6 +678,9 @@ class MetaData{
|
||||||
//echo "$subjns, $subject, $predns, $predicate, $predxml, $objns, $object\n";
|
//echo "$subjns, $subject, $predns, $predicate, $predxml, $objns, $object\n";
|
||||||
//$predns = strtolower($predns);
|
//$predns = strtolower($predns);
|
||||||
//$predicate = strtolower($predicate);
|
//$predicate = strtolower($predicate);
|
||||||
|
foreach(
|
||||||
|
array('subjns', 'subject', 'predns', 'predicate', 'objns', 'object'
|
||||||
|
) as $v) $$v = addslashes($$v);
|
||||||
$predns_sql = (is_null($predns) ? "NULL" : "'$predns'" );
|
$predns_sql = (is_null($predns) ? "NULL" : "'$predns'" );
|
||||||
$objns_sql = (is_null($objns) ? "NULL" : "'$objns'" );
|
$objns_sql = (is_null($objns) ? "NULL" : "'$objns'" );
|
||||||
$object_sql = (is_null($object)? "NULL" : "'$object'");
|
$object_sql = (is_null($object)? "NULL" : "'$object'");
|
||||||
|
@ -803,6 +808,7 @@ class MetaData{
|
||||||
'localPart' => $predicate,
|
'localPart' => $predicate,
|
||||||
'attributes'=> $attrs,
|
'attributes'=> $attrs,
|
||||||
'content' => (is_null($object) ? $children : $object),
|
'content' => (is_null($object) ? $children : $object),
|
||||||
|
# 'content' => (is_null($object) ? $children : htmlentities($object, ENT_COMPAT, 'UTF-8')),
|
||||||
), FALSE);
|
), FALSE);
|
||||||
}else{
|
}else{
|
||||||
$node = array_merge(
|
$node = array_merge(
|
||||||
|
@ -851,10 +857,12 @@ class MetaData{
|
||||||
switch($predxml){
|
switch($predxml){
|
||||||
case"N":
|
case"N":
|
||||||
$nSpaces["$predicate"] = $object;
|
$nSpaces["$predicate"] = $object;
|
||||||
|
# $nSpaces["$predicate"] = htmlentities($object, ENT_COMPAT, 'UTF-8');
|
||||||
case"A":
|
case"A":
|
||||||
$sep=':';
|
$sep=':';
|
||||||
if($predns=='' || $predicate=='') $sep='';
|
if($predns=='' || $predicate=='') $sep='';
|
||||||
$attrs["{$predns}{$sep}{$predicate}"] = $object;
|
$attrs["{$predns}{$sep}{$predicate}"] = $object;
|
||||||
|
# $attrs["{$predns}{$sep}{$predicate}"] = htmlentities($object, ENT_COMPAT, 'UTF-8');
|
||||||
break;
|
break;
|
||||||
case"T":
|
case"T":
|
||||||
$children[] = $this->genXMLNode($row, $genXML);
|
$children[] = $this->genXMLNode($row, $genXML);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue