Indefero Commit Details

Date:

2011-06-15 06:50:02 (13 years 10 months ago)

Author:

Thomas Keller

Branch:

develop, feature.content-md5, feature.diff-whitespace, feature.issue-of-others, feature.search-filter, feature.webrepos, feature.wiki-default-page, release-1.2, release-1.3

Commit:

4879d64989c35f95cef71ac5f9b0ca6e272172d5

Parents:

8e4f828cc6a880f28e1fa5e6d04861bcbd1370d8

Message:

If git's author name does not contain valid utf-8 bytes, skip the author lookup in the database, which would otherwise only bring up errors.

Changes:

File differences

-33
34 34
35 35
36
37
36 38
37 39
38 40
+  ATTENTION: This needs Pluf 46b7f251 or newer!␊
- Fix the branch links users of the Subversion frontend get when they enter a wrong revision␊
  and only display this list if there are any branches available for all SCMs␊
- If git's author name is not encoded in an UTF-8 compatible encoding, skip the author lookup,␊
  as we have no information what the author string is actually encoded in␊
␊
## Documentation␊
␊
   ATTENTION: This needs Pluf 46b7f251 or newer!␊
 - Fix the branch links users of the Subversion frontend get when they enter a wrong revision␊
   and only display this list if there are any branches available for all SCMs␊
+- If git's author name is not encoded in an UTF-8 compatible encoding, skip the author lookup,␊
+  as we have no information what the author string is actually encoded in␊
 ␊
 ## Documentation␊
 ␊

-346
347 347
348 348
349
350
351
352
353
354
355
356
349 357
350 358
351 359
+        if (!preg_match('/<(.*)>/', $author, $match)) {␊
            return null;␊
        }␊
        // FIXME: newer git versions know a i18n.commitencoding setting which␊
        // leads to another header, "encoding", with which we _could_ try to␊
        // decode the string into utf8. Unfortunately this does not always␊
        // work, especially not in older repos, so we would then still have␊
        // to supply some fallback.␊
        if (!mb_check_encoding($match[1], 'UTF-8')) {␊
            return null;␊
        }␊
        $sql = new Pluf_SQL('login=%s', array($match[1]));␊
        $users = Pluf::factory('Pluf_User')->getList(array('filter'=>$sql->gen()));␊
        if ($users->count() > 0) {␊
         if (!preg_match('/<(.*)>/', $author, $match)) {␊
             return null;␊
         }␊
+        // FIXME: newer git versions know a i18n.commitencoding setting which␊
+        // leads to another header, "encoding", with which we _could_ try to␊
+        // decode the string into utf8. Unfortunately this does not always␊
+        // work, especially not in older repos, so we would then still have␊
+        // to supply some fallback.␊
+        if (!mb_check_encoding($match[1], 'UTF-8')) {␊
+            return null;␊
+        }␊
         $sql = new Pluf_SQL('login=%s', array($match[1]));␊
         $users = Pluf::factory('Pluf_User')->getList(array('filter'=>$sql->gen()));␊
         if ($users->count() > 0) {␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags