Changeset 5eff4f9ad6bdfcce8faf7b93651c1e3c0c6d9ba7

Timestamp:

11/01/11 22:39:38 (7 months ago)

Author:

xemle <xemle@phtagr.org>

Children:

8c7bdaacfc5840aa3b20168ffc12b8546f4585f9

Parents:

3ec95e9880d43327330fd0a12ac26865aadd5830, eb98985c42c460eefec3d0bb400ee3aa64c4476b

git-committer:

xemle <xemle@phtagr.org> / 2011-11-01T22:39:38Z+0100

Message:

Merge branch 'dev' of  git://github.com/xemle/phtagr into dev

Location:

controllers

Files:

• components/file_cache.php (modified) (1 diff)
• explorer_controller.php (modified) (2 diffs)

controllers/components/file_cache.php

@@ -109 +109 @@
         $filename = $folder->addPathElement($cacheDir, $file);
         unlink($filename);
-        clearstatcache();
       }
+      clearstatcache();
     } else {
       Logger::trace("No cached files found for image $mediaId");

controllers/explorer_controller.php

@@ -80 +80 @@
       if ($type == 'tag' || $type == 'category') {
         $field = Inflector::camelize($type);
-        $value = $this->data[$field]['name'];
+        $value = $this->data[$field]['names'];
       } else {
         $value = $this->data['Location'][$type];
@@ -222 +222 @@
     $isNegated = false;
     $normalized = $value;
-    if ($value && $value[0] = '-') {
+    if ($value && $value[0] == '-') {
       $normalized = trim(substr($value, 1));
       $isNegated = true;