fix

application/config/config.php

@@ -442,30 +442,30 @@ $config['head']['default']['js'] = array(
 	"___path.static.framework___/js/ui/toolbar.js",
 
 	/* LiveStreet */
-	"___path.static.framework___/js/livestreet/favourite.js",
-	"___path.static.framework___/js/livestreet/blocks.js",
-	"___path.static.framework___/js/livestreet/pagination.js",
-	"___path.static.framework___/js/livestreet/editor.js",
-	"___path.static.framework___/js/livestreet/talk.js",
-	"___path.static.framework___/js/livestreet/vote.js",
-	"___path.static.framework___/js/livestreet/poll.js",
-	"___path.static.framework___/js/livestreet/subscribe.js",
-	"___path.static.framework___/js/livestreet/geo.js",
-	"___path.static.framework___/js/livestreet/wall.js",
-	"___path.static.framework___/js/livestreet/usernote.js",
-	"___path.static.framework___/js/livestreet/comments.js",
-	"___path.static.framework___/js/livestreet/blog.js",
-	"___path.static.framework___/js/livestreet/user.js",
-	"___path.static.framework___/js/livestreet/userfeed.js",
-	"___path.static.framework___/js/livestreet/stream.js",
-	"___path.static.framework___/js/livestreet/photoset.js",
-	"___path.static.framework___/js/livestreet/toolbar.js",
-	"___path.static.framework___/js/livestreet/settings.js",
-	"___path.static.framework___/js/livestreet/topic.js",
-	"___path.static.framework___/js/livestreet/admin.js",
-	"___path.static.framework___/js/livestreet/admin.userfield.js",
-	"___path.static.framework___/js/livestreet/captcha.js",
-	"___path.static.framework___/js/livestreet/init.js",
+	"___path.root.web___/application/frontend/common/js/favourite.js",
+	"___path.root.web___/application/frontend/common/js/blocks.js",
+	"___path.root.web___/application/frontend/common/js/pagination.js",
+	"___path.root.web___/application/frontend/common/js/editor.js",
+	"___path.root.web___/application/frontend/common/js/talk.js",
+	"___path.root.web___/application/frontend/common/js/vote.js",
+	"___path.root.web___/application/frontend/common/js/poll.js",
+	"___path.root.web___/application/frontend/common/js/subscribe.js",
+	"___path.root.web___/application/frontend/common/js/geo.js",
+	"___path.root.web___/application/frontend/common/js/wall.js",
+	"___path.root.web___/application/frontend/common/js/usernote.js",
+	"___path.root.web___/application/frontend/common/js/comments.js",
+	"___path.root.web___/application/frontend/common/js/blog.js",
+	"___path.root.web___/application/frontend/common/js/user.js",
+	"___path.root.web___/application/frontend/common/js/userfeed.js",
+	"___path.root.web___/application/frontend/common/js/stream.js",
+	"___path.root.web___/application/frontend/common/js/photoset.js",
+	"___path.root.web___/application/frontend/common/js/toolbar.js",
+	"___path.root.web___/application/frontend/common/js/settings.js",
+	"___path.root.web___/application/frontend/common/js/topic.js",
+	"___path.root.web___/application/frontend/common/js/admin.js",
+	"___path.root.web___/application/frontend/common/js/admin.userfield.js",
+	"___path.root.web___/application/frontend/common/js/captcha.js",
+	"___path.root.web___/application/frontend/common/js/init.js",
 
 	"http://yandex.st/share/share.js" => array('merge'=>false),
 );

application/frontend/common/js/captcha.js

@@ -41,7 +41,7 @@ ls.captcha = (function ($) {
 	 * @return {String} URL каптчи
 	 */
 	this.getCaptchaUrl = function () {
-		return DIR_ENGINE_LIBS + '/external/kcaptcha/index.php?' + SESSION_NAME + '=' + SESSION_ID + '&n=' + Math.random();
+		return DIR_ENGINE_LIBS + '/vendor/kcaptcha/index.php?' + SESSION_NAME + '=' + SESSION_ID + '&n=' + Math.random();
 	};
 
 	/**

framework/config/config.php

@@ -55,7 +55,7 @@ if (isset($_SERVER['HTTP_HOST'])) {
 $config['path']['root']['server']     		= dirname(dirname(dirname(__FILE__)));           // полный путь до сайта в файловой системе
 $config['path']['root']['application']     	= '___path.root.server___/application';           // полный путь до сайта в файловой системе
 $config['path']['root']['engine']           = LS_FRAMEWORK_PATH;                         // полный путь до сайта в файловой системе;
-$config['path']['root']['engine_lib']       = '___path.root.engine___/libs';                        // полный путь до сайта в файловой системе
+$config['path']['root']['engine_lib']       = '___path.root.web___/framework/libs';                        // полный путь до сайта в файловой системе
 $config['path']['root']['framework']		= '___path.root.engine___';
 $config['path']['static']['root']           = '___path.root.web___';                                   // чтоб можно было статику засунуть на отдельный сервер
 $config['path']['static']['skin']           = '___path.static.root___/application/frontend/skin/___view.skin___';
@@ -250,32 +250,6 @@ $config['head']['default']['js'] = array(
 	"___path.static.framework___/js/ui/tab.js",
 	"___path.static.framework___/js/ui/modal.js",
 	"___path.static.framework___/js/ui/toolbar.js",
-
-	/* LiveStreet */
-	"___path.static.framework___/js/livestreet/favourite.js",
-	"___path.static.framework___/js/livestreet/blocks.js",
-	"___path.static.framework___/js/livestreet/pagination.js",
-	"___path.static.framework___/js/livestreet/editor.js",
-	"___path.static.framework___/js/livestreet/talk.js",
-	"___path.static.framework___/js/livestreet/vote.js",
-	"___path.static.framework___/js/livestreet/poll.js",
-	"___path.static.framework___/js/livestreet/subscribe.js",
-	"___path.static.framework___/js/livestreet/geo.js",
-	"___path.static.framework___/js/livestreet/wall.js",
-	"___path.static.framework___/js/livestreet/usernote.js",
-	"___path.static.framework___/js/livestreet/comments.js",
-	"___path.static.framework___/js/livestreet/blog.js",
-	"___path.static.framework___/js/livestreet/user.js",
-	"___path.static.framework___/js/livestreet/userfeed.js",
-	"___path.static.framework___/js/livestreet/stream.js",
-	"___path.static.framework___/js/livestreet/photoset.js",
-	"___path.static.framework___/js/livestreet/toolbar.js",
-	"___path.static.framework___/js/livestreet/settings.js",
-	"___path.static.framework___/js/livestreet/topic.js",
-	"___path.static.framework___/js/livestreet/admin.js",
-	"___path.static.framework___/js/livestreet/admin.userfield.js",
-	"___path.static.framework___/js/livestreet/captcha.js",
-	"___path.static.framework___/js/livestreet/init.js",
 );
 
 $config['head']['default']['css'] = array(