diff --git a/AUTHORS b/AUTHORS index f4be9ef..f654b68 100644 --- a/AUTHORS +++ b/AUTHORS @@ -7,6 +7,7 @@ Much appreciated contributors (in alphabetical order): Ludovic Bellière bohwaz Adrien Bustany + Dmitry Dulepov Baptiste Durand-Bret Manuel Eidenberger Raphaël Emourgeon diff --git a/NEWS.mdtext b/NEWS.mdtext index 54b0622..96833bb 100644 --- a/NEWS.mdtext +++ b/NEWS.mdtext @@ -37,6 +37,7 @@ - Add more file extensions supported by our in-tree prettify version (issues 490 and 567) - Do not clean `` and `` HTML markup from user input (issue 509) - Improve HTML validation by switching from `strict` to `transitional` DOCTYPE (issue 511) +- Ignore XML parsing problems when trying to retrieve commit messages for svn (issue 518) - Properly handle git commits without a changelog title (issue 520) - Improve BSD compatibility in shell scripts (issue 526) - Properly render inner whitespaces in viewed issue attachments (issue 528) diff --git a/src/IDF/Scm/Svn.php b/src/IDF/Scm/Svn.php index 1904079..5767aba 100644 --- a/src/IDF/Scm/Svn.php +++ b/src/IDF/Scm/Svn.php @@ -266,8 +266,13 @@ class IDF_Scm_Svn extends IDF_Scm escapeshellarg($this->repo), escapeshellarg($rev)); $cmd = Pluf::f('idf_exec_cmd_prefix', '').$cmd; - $xml = simplexml_load_string(self::shell_exec('IDF_Scm_Svn::getCommitMessage', $cmd)); - $this->cache['commitmess'][$rev] = (string) $xml->logentry->msg; + try { + $xml = simplexml_load_string(self::shell_exec('IDF_Scm_Svn::getCommitMessage', $cmd)); + $this->cache['commitmess'][$rev] = (string) $xml->logentry->msg; + } + catch (Exception $e) { + $this->cache['commitmess'][$rev] = ''; + } return $this->cache['commitmess'][$rev]; }