diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/phorkie/Renderer/Geshi.php | 2 | ||||
| -rw-r--r-- | src/phorkie/Repository/LinkbackReceiver.php | 15 |
2 files changed, 12 insertions, 5 deletions
diff --git a/src/phorkie/Renderer/Geshi.php b/src/phorkie/Renderer/Geshi.php index c422716..0c545ed 100644 --- a/src/phorkie/Renderer/Geshi.php +++ b/src/phorkie/Renderer/Geshi.php @@ -15,7 +15,7 @@ class Renderer_Geshi { /** * Yes, geshi needs to be in your include path - * We use the mediawiki geshi extension package. + * We use the geshi pear package. */ if (!class_exists('\\geshi', true)) { require_once $GLOBALS['phorkie']['cfg']['geshi']; diff --git a/src/phorkie/Repository/LinkbackReceiver.php b/src/phorkie/Repository/LinkbackReceiver.php index c9b3d03..c808f45 100644 --- a/src/phorkie/Repository/LinkbackReceiver.php +++ b/src/phorkie/Repository/LinkbackReceiver.php @@ -120,13 +120,19 @@ class Repository_LinkbackReceiver */ protected function localizeGitUrls($arGitUrls) { - $pub = $GLOBALS['phorkie']['cfg']['git']['public']; - $pri = $GLOBALS['phorkie']['cfg']['git']['private']; + $pub = $pri = null; + if (isset($GLOBALS['phorkie']['cfg']['git']['public'])) { + $pub = $GLOBALS['phorkie']['cfg']['git']['public']; + } + if (isset($GLOBALS['phorkie']['cfg']['git']['private'])) { + $pri = $GLOBALS['phorkie']['cfg']['git']['private']; + } $arRemoteCloneUrls = array(); foreach ($arGitUrls as $remoteTitle => $arUrls) { foreach ($arUrls as $remoteCloneUrl) { - if (substr($remoteCloneUrl, 0, strlen($pub)) == $pub + if ($pub !== null + && substr($remoteCloneUrl, 0, strlen($pub)) == $pub && substr($remoteCloneUrl, -4) == '.git' ) { $id = substr($remoteCloneUrl, strlen($pub), -4); @@ -136,7 +142,8 @@ class Repository_LinkbackReceiver $arRemoteCloneUrls[$repo->gitDir] = $remoteTitle; } catch (Exception $e) { } - } else if (substr($remoteCloneUrl, 0, strlen($pri)) == $pri + } else if ($pri !== null + && substr($remoteCloneUrl, 0, strlen($pri)) == $pri && substr($remoteCloneUrl, -4) == '.git' ) { $id = substr($remoteCloneUrl, strlen($pri), -4); |