aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Weiske <cweiske@cweiske.de>2012-04-13 13:59:06 +0200
committerChristian Weiske <cweiske@cweiske.de>2012-04-13 13:59:06 +0200
commit09b7728bd2beca1270922a38d79498e3c4fa0456 (patch)
tree1f0dc18004e783b7a9f8c82bf7ab5a17dc4fc3ee /src
parentfe8ea32b7cc8ef44e53e5edf9ea954e516ec6d98 (diff)
downloadphorkie-09b7728bd2beca1270922a38d79498e3c4fa0456.tar.gz
phorkie-09b7728bd2beca1270922a38d79498e3c4fa0456.zip
fix ticket #1: error setting name with slashes
Diffstat (limited to 'src')
-rw-r--r--src/phorkie/Repository/Post.php17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/phorkie/Repository/Post.php b/src/phorkie/Repository/Post.php
index a982c7f..471cbd8 100644
--- a/src/phorkie/Repository/Post.php
+++ b/src/phorkie/Repository/Post.php
@@ -67,12 +67,17 @@ class Repository_Post
} else if (isset($arFile['delete']) && $arFile['delete'] == 1) {
$bDelete = true;
} else if ($orignalName != $name) {
- //FIXME: what to do with overwrites?
- $vc->getCommand('mv')
- ->addArgument($orignalName)
- ->addArgument($name)
- ->execute();
- $bChanged = true;
+ if (strpos($name, '/') === false) {
+ //ignore names with a slash in it, would be new directory
+ //FIXME: what to do with overwrites?
+ $vc->getCommand('mv')
+ ->addArgument($orignalName)
+ ->addArgument($name)
+ ->execute();
+ $bChanged = true;
+ } else {
+ $name = $orignalName;
+ }
}
$file = $this->repo->getFileByName($name, false);