Mercurial > hg > fapweb

changeset 742:66e415b69c75

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename some variables.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 19 Nov 2014 05:20:35 +0200
parents 1a4a5267aabe
children 6cd2ae354e0a
files msite.inc.php
diffstat 1 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/msite.inc.php	Wed Nov 19 05:15:38 2014 +0200
+++ b/msite.inc.php	Wed Nov 19 05:20:35 2014 +0200
@@ -634,14 +634,14 @@
 function stGetEntryPreviewData($compo, $entry, $probePreview, $fullData)
 {
   $res = array();
-  $entryStore = stGetSetting("entryStore");
-  $entryPreviews = stGetSetting("entryPreviews");
-  $entryURL = stGetSetting("entryURL");
+  $entryPath = stGetSetting("entryPath");
+  $previewPath = stGetSetting("previewPath");
+  $previewURL = stGetSetting("previewURL");
   $thumbDir = stGetSetting("thumbnailSubDir");
 
   // Data for the actual entry file
   $res["previewType"] = ($entry["preview_type"] != EPREV_NONE) ? $entry["preview_type"] : $compo["preview_type"];
-  $res["entryFile"] = stMakePath(FALSE, FALSE, array($entryStore, $compo["cpath"], $entry["filename"]));
+  $res["entryFile"] = stMakePath(FALSE, FALSE, array($entryPath, $compo["cpath"], $entry["filename"]));
   if ($fullData)
   {
     $res["entrySize"] = @filesize($res["entryFile"]);
@@ -678,17 +678,17 @@
   {
     foreach ($fexts as $fext)
     {
-      $filename = stMakePath(FALSE, $fext, array($entryPreviews, $compo["cpath"], $res["fileBase"]));
+      $filename = stMakePath(FALSE, $fext, array($previewPath, $compo["cpath"], $res["fileBase"]));
       if ($probePreview == FALSE || file_exists($filename))
       {
         $res["previewFileType"]  = $ftype;
         $res["previewPath"]  = $filename;
-        $res["previewURL"]   = stMakePath(TRUE, $fext, array($entryURL, $compo["cpath"], $res["fileBase"]));
+        $res["previewURL"]   = stMakePath(TRUE, $fext, array($previewURL, $compo["cpath"], $res["fileBase"]));
 
         if ($res["previewType"] == EPREV_IMAGE)
         {
-          $res["thumbPath"] = stMakePath(TRUE, $fext, array($entryPreviews, $compo["cpath"], $thumbDir, $res["fileBase"]));
-          $res["thumbURL"]  = stMakePath(TRUE, $fext, array($entryURL, $compo["cpath"], $thumbDir, $res["fileBase"]));
+          $res["thumbPath"] = stMakePath(TRUE, $fext, array($previewPath, $compo["cpath"], $thumbDir, $res["fileBase"]));
+          $res["thumbURL"]  = stMakePath(TRUE, $fext, array($previewURL, $compo["cpath"], $thumbDir, $res["fileBase"]));
         }
 
         if ($fullData)