From 3069eaf35e833ffe4a1c1c7829dd7e168ae27420 Mon Sep 17 00:00:00 2001 From: Ciro Mattia Gonano Date: Wed, 11 Sep 2013 15:56:48 +0200 Subject: Merge up to r3319 --- .../PhpDocumentor/prado_patch_chm_builder_fix.patch | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 buildscripts/PhpDocumentor/prado_patch_chm_builder_fix.patch (limited to 'buildscripts/PhpDocumentor/prado_patch_chm_builder_fix.patch') diff --git a/buildscripts/PhpDocumentor/prado_patch_chm_builder_fix.patch b/buildscripts/PhpDocumentor/prado_patch_chm_builder_fix.patch deleted file mode 100644 index 4889d501..00000000 --- a/buildscripts/PhpDocumentor/prado_patch_chm_builder_fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: phpDocumentor/Converters/CHM/default/CHMdefaultConverter.inc -=================================================================== ---- phpDocumentor/Converters/CHM/default/CHMdefaultConverter.inc (revisione 3068) -+++ phpDocumentor/Converters/CHM/default/CHMdefaultConverter.inc (copia locale) -@@ -560,7 +560,7 @@ - */ - function returnSee(&$element, $eltext = false, $with_a = true) - { -- if (!$element) return false; -+ if (!is_object($element) || !$element) return false; - if (!$with_a) return $this->getId($element, false); - if (!$eltext) - { -- cgit v1.2.3