Index: branches/unlabeled/unlabeled-1.166.4/core/kernel/application.php
===================================================================
diff -u -r7456 -r7466
--- branches/unlabeled/unlabeled-1.166.4/core/kernel/application.php	(.../application.php)	(revision 7456)
+++ branches/unlabeled/unlabeled-1.166.4/core/kernel/application.php	(.../application.php)	(revision 7466)
@@ -1254,7 +1254,14 @@
 	 */
 	function getPassInfo($pass = 'all')
 	{
-		$pass = trim(preg_replace('/(?<=,|\\A)all(?=,|\\z)/', trim($this->GetVar('passed'), ','), trim($pass, ',')), ',');
+		if (!$pass) $pass = 'all';
+		$pass = trim(
+				preg_replace(
+					'/(?<=,|\\A)all(?=,|\\z)/',
+					trim($this->GetVar('passed'), ','),
+					trim($pass, ',')
+				),
+		 ',');
 
 		if (!$pass) {
 			return Array();
Index: branches/unlabeled/unlabeled-1.44.2/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/commands.php
===================================================================
diff -u -r6801 -r7466
--- branches/unlabeled/unlabeled-1.44.2/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/commands.php	(.../commands.php)	(revision 6801)
+++ branches/unlabeled/unlabeled-1.44.2/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/commands.php	(.../commands.php)	(revision 7466)
@@ -111,18 +111,34 @@
 	$application =& kApplication::Instance();
 	$application->Init();
 
-	$lang = $application->GetVar('m_lang');
+	if ($application->isModuleEnabled('Proj-CMS')) {
+		$lang = $application->GetVar('m_lang');
 
-	$query = 'SELECT PageId, Path, l'.$lang.'_Title AS Title FROM '.TABLE_PREFIX.'Pages ORDER By l'.$lang.'_Title';
-	$pages = $application->Conn->Query($query);
+		$query = 'SELECT CategoryId, NamedParentPath, l'.$lang.'_Title AS Title FROM '.TABLE_PREFIX.'Category ORDER By l'.$lang.'_Title';
+		$pages = $application->Conn->Query($query);
 
-	$res = '';
-	foreach ($pages as $page) {
-		$page_path = $page['Path'].'.html';
-		$title = $page['Title'].' ('.$page_path.')';
-		$res .= '<CmsPage path="'.$page_path.'" title="'.$prefix.htmlspecialchars($title,ENT_QUOTES).'" st_id="'.$rs->fields['PageId'].'" serverpath="'.BASE_PATH.'/" />';
+		$res = '';
+		foreach ($pages as $page) {
+			$page_path = preg_replace('/^content\//', '', strtolower($page['NamedParentPath']).'.html');
+			$title = $page['Title'].' ('.$page_path.')';
+			$res .= '<CmsPage path="'.$page_path.'" title="'.$prefix.htmlspecialchars($title,ENT_QUOTES).'" st_id="'.$page['CategoryId'].'" serverpath="'.BASE_PATH.'/" />';
+		}
 	}
+	else {
 
+		$lang = $application->GetVar('m_lang');
+
+		$query = 'SELECT PageId, Path, l'.$lang.'_Title AS Title FROM '.TABLE_PREFIX.'Pages ORDER By l'.$lang.'_Title';
+		$pages = $application->Conn->Query($query);
+
+		$res = '';
+		foreach ($pages as $page) {
+			$page_path = $page['Path'].'.html';
+			$title = $page['Title'].' ('.$page_path.')';
+			$res .= '<CmsPage path="'.$page_path.'" title="'.$prefix.htmlspecialchars($title,ENT_QUOTES).'" st_id="'.$page['PageId'].'" serverpath="'.BASE_PATH.'/" />';
+		}
+	}
+
 	return $res;
 }
 function ReadCmsTree($st_id, $level = 0)
Index: branches/unlabeled/unlabeled-1.18.2/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/config.php
===================================================================
diff -u -r6800 -r7466
--- branches/unlabeled/unlabeled-1.18.2/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/config.php	(.../config.php)	(revision 6800)
+++ branches/unlabeled/unlabeled-1.18.2/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/config.php	(.../config.php)	(revision 7466)
@@ -39,10 +39,11 @@
 
 }
 else {
-	$fp = realpath(dirname(__FILE__).'/../../../../../../../../../');
+	$fp = realpath(dirname(__FILE__).'/../../../../../../../../');
 	define('FULL_PATH', $fp);
 	define('DEBUG_MODE', 0);
-	define('REL_PATH', 'admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php');
+	define('DBG_SKIP_REPORTING', 1);
+	define('REL_PATH', 'core/cmseditor/editor/filemanager/browser/default/connectors/php');
 	$kernel4_startup = $fp."/core/kernel/startup.php";
 	$Config['K4Mode'] = 1;
 	include_once($kernel4_startup);
Index: branches/unlabeled/unlabeled-1.7.2/core/units/general/helpers/mod_rewrite_helper.php
===================================================================
diff -u -r7036 -r7466
--- branches/unlabeled/unlabeled-1.7.2/core/units/general/helpers/mod_rewrite_helper.php	(.../mod_rewrite_helper.php)	(revision 7036)
+++ branches/unlabeled/unlabeled-1.7.2/core/units/general/helpers/mod_rewrite_helper.php	(.../mod_rewrite_helper.php)	(revision 7466)
@@ -303,9 +303,9 @@
 
 				$sql = 'SELECT CategoryId FROM '.TABLE_PREFIX.'Category
 								WHERE
-									NamedParentPath = '.$this->Conn->qstr($template_path).'
+									LOWER(NamedParentPath) = '.$this->Conn->qstr($template_path).'
 									AND
-									Status = 1';
+									Status IN (1,4) ';
 				$template_found = $this->Conn->GetRow($sql);
 
 				if ($template_found) {