From fd5ca60ed9c550551244bc95d83f8d421526453a Mon Sep 17 00:00:00 2001 From: Heikki Hokkanen Date: Mon, 2 Aug 2010 21:21:43 +0300 Subject: [PATCH] s/fixEncoding/fix_encoding/. --- inc/functions.php | 2 +- index.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/inc/functions.php b/inc/functions.php index 7165b75..10516e4 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -12,7 +12,7 @@ function debug($msg) } } -function fixEncoding($in_str) +function fix_encoding($in_str) { $cur_encoding = mb_detect_encoding($in_str) ; if($cur_encoding == "UTF-8" && mb_check_encoding($in_str,"UTF-8")) { diff --git a/index.php b/index.php index f541e2d..00b1a4c 100644 --- a/index.php +++ b/index.php @@ -247,7 +247,7 @@ elseif ($action === 'commitdiff') { $page['author_mail'] = $info['author_mail']; $page['author_datetime'] = $info['author_datetime']; - $text = fixEncoding(git_diff($page['project'], "$hash^", $hash)); + $text = fix_encoding(git_diff($page['project'], "$hash^", $hash)); list($page['files'], $page['diffdata']) = format_diff($text); //$page['diffdata'] = format_diff($text); } @@ -496,7 +496,7 @@ elseif ($action === 'viewblob') { $page['pathinfo'] = git_get_path_info($page['project'], $page['commit_id'], $page['path']); - $page['data'] = fixEncoding(join("\n", run_git($page['project'], "cat-file blob $page[hash]"))); + $page['data'] = fix_encoding(join("\n", run_git($page['project'], "cat-file blob $page[hash]"))); $page['lastlog'] = git_get_commit_info($page['project'], 'HEAD', $page['path']); -- 2.11.4.GIT