move _inc and _lib to includes/ and use PKG_INCLUDE_PATH constants

3 files changed, 3 insertions, 3 deletions

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 = '';