[geeklog-hg] geeklog: Removed hardcoded public_html directory name from Moder...

[geeklog-cvs at lists.geeklog.net]

changeset 9283:740c7476b1be
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/740c7476b1be
user: Tom <websitemaster at cogeco.net>
date: Sat Sep 07 10:41:22 2013 -0400
description:
Removed hardcoded public_html directory name from Modern Curve style.css.php. Now only data is hardcoded.

diffstat:

 public_html/layout/modern_curve/style.css.php |  11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diffs (29 lines):

diff -r cb55a706acab -r 740c7476b1be public_html/layout/modern_curve/style.css.php
--- a/public_html/layout/modern_curve/style.css.php	Sat Sep 07 10:09:16 2013 -0400
+++ b/public_html/layout/modern_curve/style.css.php	Sat Sep 07 10:41:22 2013 -0400
@@ -51,9 +51,12 @@
 $LANG_DIRECTION = $dir; // Need to set this for themes function.php file
 
 // Set Path Variables
-$path_html = $_CONF['path'] . 'public_html';
-$path_themes = $path_html . '/layout/'; 
+$path_html = dirname(dirname(getcwd())); // Should always be the directory above
+$path_themes = $path_html . '/layout/';  
 $path_layout = $path_themes . $theme . '/';
+// Set etag file name and path
+// have moved or renamed /data directory, please change the following line accordingly.
+$etag_filename =  $_CONF['path'] . 'data/layout_css/' . $theme . '_' . $dir . '_etag.cache';
 
 /**
 * Get Theme Info
@@ -127,10 +130,6 @@
 $info['priority'] = 1000;
 $cssfiles[] = $info;
 
-// We assume /data directory is right under $_CONF['path'] directory.  If you
-// have moved or renamed /data directory, please change the following line accordingly.
-$etag_filename =  $_CONF['path'] . 'data/layout_css/' . $theme . '_' . $dir . '_etag.cache';
-
 if (isset($_SERVER['HTTP_IF_NONE_MATCH'])) {
     if (is_readable($etag_filename)) {
         $etag = file_get_contents($etag_filename);