summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bit_setup_inc.php2
-rw-r--r--includes/classes/BitSmarty.php (renamed from BitSmarty.php)0
-rw-r--r--includes/classes/BitThemes.php (renamed from BitThemes.php)4
-rw-r--r--includes/menu_register_inc.php (renamed from menu_register_inc.php)0
-rw-r--r--smartyplugins/function.include_js.php2
-rw-r--r--smartyplugins/function.poll.php2
-rw-r--r--smartyplugins/function.popup.php2
7 files changed, 6 insertions, 6 deletions
diff --git a/bit_setup_inc.php b/bit_setup_inc.php
index 5c50706..93efa4c 100644
--- a/bit_setup_inc.php
+++ b/bit_setup_inc.php
@@ -19,7 +19,7 @@ $gLibertySystem->registerService(
array( 'description' => 'Applied when user themes are enabled; See theme pkg administration to enable.' )
);
-require_once( THEMES_PKG_PATH."BitThemes.php" );
+require_once( THEMES_PKG_CLASS_PATH.'BitThemes.php' );
BitThemes::loadSingleton();
global $gBitThemes, $gBitSmarty;
diff --git a/BitSmarty.php b/includes/classes/BitSmarty.php
index b8978d0..b8978d0 100644
--- a/BitSmarty.php
+++ b/includes/classes/BitSmarty.php
diff --git a/BitThemes.php b/includes/classes/BitThemes.php
index b64299b..487789e 100644
--- a/BitThemes.php
+++ b/includes/classes/BitThemes.php
@@ -6,7 +6,7 @@
/**
* Set-up
*/
-require_once( KERNEL_PKG_PATH.'BitCache.php' );
+require_once( KERNEL_PKG_CLASS_PATH.'BitCache.php' );
/**
* BitThemes
*
@@ -1646,7 +1646,7 @@ class BitThemes extends BitSingleton {
$packer = new JavaScriptPacker( file_get_contents( $pJavascriptFile ) );
$this->mThemeCache->writeCacheFile( $cachefile, $packer->pack() );
*/
- $cacheData = shell_exec( 'java -jar '.UTIL_PKG_INC.'yui/yuicompressor-2.4.2.jar --type js '.$pJavascriptFile );
+ $cacheData = shell_exec( 'java -jar '.UTIL_PKG_INCLUDE_PATH.'yui/yuicompressor-2.4.2.jar --type js '.$pJavascriptFile );
$this->mThemeCache->writeCacheFile( $cachefile, $cacheData );
}
diff --git a/menu_register_inc.php b/includes/menu_register_inc.php
index 18842ab..18842ab 100644
--- a/menu_register_inc.php
+++ b/includes/menu_register_inc.php
diff --git a/smartyplugins/function.include_js.php b/smartyplugins/function.include_js.php
index 9e93575..60b6508 100644
--- a/smartyplugins/function.include_js.php
+++ b/smartyplugins/function.include_js.php
@@ -40,7 +40,7 @@ function smarty_function_include_js( $params,&$gBitSmarty ) {
// if the file hasn't been packed and cached yet, we do that now.
if( !$BitCache->isCached( $cachefile, filemtime( $file ))) {
// pack and cache it
- $cachedata = shell_exec( 'java -jar '.UTIL_PKG_INC.'yui/yuicompressor-2.4.2.jar --type js '.$file );
+ $cachedata = shell_exec( 'java -jar '.UTIL_PKG_INCLUDE_PATH.'yui/yuicompressor-2.4.2.jar --type js '.$file );
$BitCache->writeCacheFile( $cachefile, $cachedata );
}
diff --git a/smartyplugins/function.poll.php b/smartyplugins/function.poll.php
index dcc9142..efe7b8b 100644
--- a/smartyplugins/function.poll.php
+++ b/smartyplugins/function.poll.php
@@ -19,7 +19,7 @@ function smarty_function_poll($params, &$gBitSmarty) {
extract($params);
// Param = zone
include_once( POLLS_PKG_PATH.'poll_lib.php' );
- include_once( LIBERTY_PKG_PATH.'LibertyComment.php' );
+ include_once( LIBERTY_PKG_CLASS_PATH.'LibertyComment.php' );
if (empty($id)) {
$id = $polllib->get_random_active_poll();
diff --git a/smartyplugins/function.popup.php b/smartyplugins/function.popup.php
index bb69517..1ea5976 100644
--- a/smartyplugins/function.popup.php
+++ b/smartyplugins/function.popup.php
@@ -18,7 +18,7 @@
* @param Smarty
* @return string
*/
-require_once(LIBERTY_PKG_PATH."LibertyContent.php");
+require_once(LIBERTY_PKG_CLASS_PATH.'LibertyContent.php');
function smarty_function_popup($params, &$gBitSmarty) {
$append = '';