Jeremy Newman : remove requirement for base_path config var
Jeremy Newman
jnewman at wine.codeweavers.com
Tue Jan 19 12:45:30 CST 2016
Module: website
Branch: master
Commit: 1fb8c25327696aa95a66618852768725534205ff
URL: http://source.winehq.org/git/website.git/?a=commit;h=1fb8c25327696aa95a66618852768725534205ff
Author: Jeremy Newman <jnewman at codeweavers.com>
Date: Tue Jan 19 11:49:42 2016 -0600
remove requirement for base_path config var
---
include/utils.php | 4 ++--
include/winehq.conf.sample | 7 ++-----
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/include/utils.php b/include/utils.php
index f9cc2c6..21d5253 100644
--- a/include/utils.php
+++ b/include/utils.php
@@ -63,7 +63,7 @@ function include_plugin ($__module, $_PLUGIN = array())
$__module = preg_replace('%(^\/|^\\\|^\.|\.\.*)%', '', $__module);
// load module if file exists
- if ($__module and file_exists("{$GLOBALS['config']->base_path}include/plugins/{$__module}.php"))
+ if ($__module and file_exists("{$GLOBALS['file_root']}/include/plugins/{$__module}.php"))
{
debug("plugin", "loading plugin: [{$__module}]");
$out = "";
@@ -74,7 +74,7 @@ function include_plugin ($__module, $_PLUGIN = array())
extract($GLOBALS, EXTR_REFS);
// execute the plugin
- include("{$config->base_path}include/plugins/{$__module}.php");
+ include("{$GLOBALS['file_root']}/include/plugins/{$__module}.php");
$out = ob_get_contents();
}
catch (_pluginError $e)
diff --git a/include/winehq.conf.sample b/include/winehq.conf.sample
index 8967c53..82db033 100644
--- a/include/winehq.conf.sample
+++ b/include/winehq.conf.sample
@@ -29,14 +29,11 @@ lang: en
base_root:
base_url: https://www.winehq.org{$base_root}/
-# base path on filesystem to website
-base_path: /home/wineowner/opt/www/
-
# Path to WWN XML files
-news_xml_path: {$base_path}news
+news_xml_path: ./news
# Path to WWN XML files
-wwn_xml_path: {$base_path}wwn
+wwn_xml_path: ./wwn
# URL for bugs
bug_system: http://bugs.winehq.org/show_bug.cgi?id=
More information about the wine-cvs
mailing list