Merge branch 'develop' of git://github.com/AKSW/Erfurt into develop

AKSW · Nov 11, 2011 · 4843d48 · 4843d48
2 parents b5b81be + 969aa35
commit 4843d48
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/Erfurt/Plugin/Manager.php b/Erfurt/Plugin/Manager.php
@@ -128,7 +128,7 @@ private function _addPlugin($pluginName, $pluginPath)
             $pluginConfig->enabled = false;
         }
 
-        $this->addPluginExternally($pluginName,$pluginName,$path,$config);
+        $this->addPluginExternally($pluginName, $pluginName, $pluginPath, $pluginConfig);
         // var_dump($pluginConfig);
     }
 

diff --git a/tests/CodeSniffer/Standards/Ontowiki/ruleset.xml b/tests/CodeSniffer/Standards/Ontowiki/ruleset.xml
@@ -2,6 +2,9 @@
 <ruleset name="Ontowiki">
  <description>A Ontowiki coding standard.</description>
 
+  <exclude-pattern>*/Parser/Sparql10/*</exclude-pattern>
+  <exclude-pattern>*/Parser/Sparql11/*</exclude-pattern>
+
  <rule ref="Zend"/>