Skip to content

Commit

Permalink
reverted and fixed improper whitespace chnages (OPSA-2013-003) (refs …
Browse files Browse the repository at this point in the history
…#3384)
  • Loading branch information
co3k committed Sep 10, 2013
1 parent a19c029 commit 6d81bff
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
4 changes: 2 additions & 2 deletions lib/vendor/Shindig/src/common/XmlError.php
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ public function dumpNode($node, $function) {
$doc->recover = false;
$doc->resolveExternals = false;

$entityLoaderConfig = libxml_disable_entity_loader(true);
$entityLoaderConfig = libxml_disable_entity_loader(true);
$newNode = @$doc->importNode($node, false);
libxml_disable_entity_loader($entityLoaderConfig);
libxml_disable_entity_loader($entityLoaderConfig);

if (! $newNode) {
echo "[Invalid node, dump failed]<br><br>";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ class TemplateParser {
private $templateLibrary;

public function dumpNode($node, $function) {

$doc = new DOMDocument(null, 'utf-8');
$doc->preserveWhiteSpace = true;
$doc->formatOutput = false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
class InputBasicXmlConverter {

public static function loadString($requestParam, $namespace = null) {
$entityLoaderConfig = libxml_disable_entity_loader(true);
$result = simplexml_load_string($requestParam, 'SimpleXMLElement', LIBXML_NOCDATA, $namespace);
libxml_disable_entity_loader($entityLoaderConfig);
$entityLoaderConfig = libxml_disable_entity_loader(true);
$result = simplexml_load_string($requestParam, 'SimpleXMLElement', LIBXML_NOCDATA, $namespace);
libxml_disable_entity_loader($entityLoaderConfig);

return $result;
return $result;
}

public static function convertActivities($xml, $activityXml) {
Expand Down

0 comments on commit 6d81bff

Please sign in to comment.