Merge pull request #67 from owncloud/remove_dompdf

remove dompdf from docx as it is in 3rdpart's root as well
owncloud-archive · Feb 17, 2014 · c7b4cdb · c7b4cdb
2 parents dad6f6b + 30e509e
commit c7b4cdb
Show file tree

Hide file tree

Showing 164 changed files with 5 additions and 33,469 deletions.
diff --git a/patches.txt b/patches.txt
@@ -0,0 +1,3 @@
+Patches:
+
+- remove dompdf from phpdocx, because we already ship dompdf in the 3rdparty's root folder (see 3ae4904 and e1e3207)
diff --git a/phpdocx/classes/AutoLoader.inc b/phpdocx/classes/AutoLoader.inc
@@ -40,7 +40,7 @@ class AutoLoader
      */
     public static function autoloadDompdf($className)
     {
-        $pathDompdf = dirname(__FILE__) . '/../pdf/dompdf_config.inc.php';
+        $pathDompdf = dirname(__FILE__) . '/../../dompdf/dompdf_config.inc.php';
         if (file_exists($pathDompdf)) {
             require_once $pathDompdf;
         }

diff --git a/phpdocx/pdf/dompdf.php b/phpdocx/pdf/dompdf.php