summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitattributes1
-rwxr-xr-xbuildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/CHMdefaultConverter.inc2
-rw-r--r--buildscripts/PhpDocumentor/prado_patch_chm_builder_fix.patch13
3 files changed, 15 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes
index 9dd0d8a0..850ed8b8 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1006,6 +1006,7 @@ buildscripts/PhpDocumentor/phpDocumentor/phpdoc.inc -text
buildscripts/PhpDocumentor/phpdoc -text
buildscripts/PhpDocumentor/phpdoc.php -text
buildscripts/PhpDocumentor/poweredbyphpdoc.gif -text
+buildscripts/PhpDocumentor/prado_patch_chm_builder_fix.patch -text
buildscripts/PhpDocumentor/prado_patch_dot_in_package_name.patch -text
buildscripts/PhpDocumentor/scripts/add_cvs.php -text
buildscripts/PhpDocumentor/scripts/create_examples.php -text
diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/CHMdefaultConverter.inc b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/CHMdefaultConverter.inc
index b9679a27..e5ad8172 100755
--- a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/CHMdefaultConverter.inc
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/CHMdefaultConverter.inc
@@ -560,7 +560,7 @@ class CHMdefaultConverter extends Converter
*/
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)
{
diff --git a/buildscripts/PhpDocumentor/prado_patch_chm_builder_fix.patch b/buildscripts/PhpDocumentor/prado_patch_chm_builder_fix.patch
new file mode 100644
index 00000000..4889d501
--- /dev/null
+++ b/buildscripts/PhpDocumentor/prado_patch_chm_builder_fix.patch
@@ -0,0 +1,13 @@
+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)
+ {