projects
/
mdref
/
mdref
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (parent:
6478b41
)
fix redirect
author
Michael Wallner
<mike@php.net>
Tue, 14 Oct 2014 16:24:37 +0000
(18:24 +0200)
committer
Michael Wallner
<mike@php.net>
Tue, 14 Oct 2014 16:24:37 +0000
(18:24 +0200)
mdref/Action.php
patch
|
blob
|
history
diff --git
a/mdref/Action.php
b/mdref/Action.php
index dafc8e55f493346e5f324fd9592bba7b2c69ce1f..dcd8fcbed025d24f4725c9b9c0976a2c19d8e2ba 100644
(file)
--- a/
mdref/Action.php
+++ b/
mdref/Action.php
@@
-135,12
+135,15
@@
class Action extends Observer {
return;
}
return;
}
+ $cnn = null;
if (($repo = $this->reference->getRepoForEntry($pld->ref, $cnn))) {
if (($repo = $this->reference->getRepoForEntry($pld->ref, $cnn))) {
- /* direct match */
- $pld->entry = $repo->getEntry($pld->ref);
- } else if (strlen($cnn)) {
- /* redirect */
- $this->serveCanonical($ctl, $cnn);
+ if (strlen($cnn)) {
+ /* redirect */
+ $this->serveCanonical($ctl, $cnn);
+ } else {
+ /* direct match */
+ $pld->entry = $repo->getEntry($pld->ref);
+ }
} else {
$this->servePreset($ctl, $pld);
}
} else {
$this->servePreset($ctl, $pld);
}