Index: branches/unlabeled/unlabeled-1.7.32/themes/default/common/head.tpl =================================================================== diff -u -r2947 -r6343 --- branches/unlabeled/unlabeled-1.7.32/themes/default/common/head.tpl (.../head.tpl) (revision 2947) +++ branches/unlabeled/unlabeled-1.7.32/themes/default/common/head.tpl (.../head.tpl) (revision 6343) @@ -140,7 +140,7 @@ { d.style.color = highlight_color; } - } + } <inp:m_page_title /> @@ -150,7 +150,16 @@ + + + + + + + + + Index: branches/unlabeled/unlabeled-1.156.2/core/kernel/application.php =================================================================== diff -u -r6308 -r6343 --- branches/unlabeled/unlabeled-1.156.2/core/kernel/application.php (.../application.php) (revision 6308) +++ branches/unlabeled/unlabeled-1.156.2/core/kernel/application.php (.../application.php) (revision 6343) @@ -201,7 +201,9 @@ { if($this->InitDone) return false; - ob_start(); // collect any output from method (other then tags) into buffer + if (!constOn('SKIP_OUT_COMPRESSION')) { + ob_start(); // collect any output from method (other then tags) into buffer + } if(defined('DEBUG_MODE') && $this->isDebugMode() && constOn('DBG_PROFILE_MEMORY')) { $this->Debugger->appendMemoryUsage('Application before Init:'); Index: branches/unlabeled/unlabeled-1.3.50/themes/default/search_results.tpl =================================================================== diff -u -r1650 -r6343 --- branches/unlabeled/unlabeled-1.3.50/themes/default/search_results.tpl (.../search_results.tpl) (revision 1650) +++ branches/unlabeled/unlabeled-1.3.50/themes/default/search_results.tpl (.../search_results.tpl) (revision 6343) @@ -37,7 +37,7 @@ - + @@ -76,7 +76,7 @@

-
"> + "> " class="input" style="width: 235px;">  " class="button">
@@ -157,7 +157,7 @@
- + @@ -176,7 +176,7 @@
- + Index: branches/unlabeled/unlabeled-1.101.2/kernel/parser.php =================================================================== diff -u -r6308 -r6343 --- branches/unlabeled/unlabeled-1.101.2/kernel/parser.php (.../parser.php) (revision 6308) +++ branches/unlabeled/unlabeled-1.101.2/kernel/parser.php (.../parser.php) (revision 6343) @@ -1260,6 +1260,14 @@ { global $objConfig, $objCatList; + $application =& kApplication::Instance(); + if ($application->isModuleEnabled('In-Edit')) { + $title = $application->ProcessTag('cms:PageInfo type="htmlhead_title"'); + if ($title && !preg_match('/^_Auto.*/', $title)) { + return $title; + } + } + $ret = strip_tags( $objConfig->Get('Site_Name') ); if(getArrayValue($attribs,'_fullpath') || getArrayValue($attribs,'_currentcategory')) { @@ -2939,6 +2947,14 @@ { global $objCatList, $objConfig; + $application =& kApplication::Instance(); + if ($application->isModuleEnabled('In-Edit')) { + $keywords = $application->ProcessTag('cms:PageInfo type="meta_keywords"'); + if ($keywords) { + return $keywords; + } + } + $keywords = ''; $catid = (int)getArrayValue($attribs, '_catid'); @@ -2966,26 +2982,34 @@ */ function m_meta_description($attribs = array()) { - global $objCatList, $objConfig; + global $objCatList, $objConfig; + $application =& kApplication::Instance(); + if ($application->isModuleEnabled('In-Edit')) { + $description = $application->ProcessTag('cms:PageInfo type="meta_description"'); + if ($description) { + return $description; + } + } + $description = ''; - $catid = (int)getArrayValue($attribs, '_catid'); - if (!$catid) - { + $catid = (int)getArrayValue($attribs, '_catid'); + if (!$catid) + { $catid = $objCatList->CurrentCategoryID(); - } + } - if ($catid) - { - $c = $objCatList->GetItem($catid); - $description = $c->Get('MetaDescription'); - } + if ($catid) + { + $c = $objCatList->GetItem($catid); + $description = $c->Get('MetaDescription'); + } - if (!$description) - { - $description = $objConfig->Get('Category_MetaDesc'); - } - return $description; + if (!$description) + { + $description = $objConfig->Get('Category_MetaDesc'); + } + return $description; } /* Index: branches/unlabeled/unlabeled-1.3.10/themes/default/common/pagetop.tpl =================================================================== diff -u -r4359 -r6343 --- branches/unlabeled/unlabeled-1.3.10/themes/default/common/pagetop.tpl (.../pagetop.tpl) (revision 4359) +++ branches/unlabeled/unlabeled-1.3.10/themes/default/common/pagetop.tpl (.../pagetop.tpl) (revision 6343) @@ -1,3 +1,6 @@ + + + @@ -12,27 +15,27 @@
- + - +


- + - +
">
">">
">
">">


Index: branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_1_3_0.txt =================================================================== diff -u -r6321 -r6343 --- branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_1_3_0.txt (.../changelog_1_3_0.txt) (revision 6321) +++ branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_1_3_0.txt (.../changelog_1_3_0.txt) (revision 6343) @@ -24,7 +24,7 @@ File in-portal/admin/install/inportal_data.sql changed File in-portal/admin/install/inportal_remove.sql changed File in-portal/admin/install/install_lib.php changed -File in-portal/admin/install/upgrades/changelog_1_3_0.txt is new; release_1_3_0 revision 1.1.2.6 +File in-portal/admin/install/upgrades/changelog_1_3_0.txt is new; release_1_3_0 revision 1.1.2.7 File in-portal/admin/install/upgrades/inportal_upgrade_v1.3.0.sql is new; release_1_3_0 revision 1.1.2.1 File in-portal/kernel/parser.php changed File in-portal/kernel/admin/advanced_view.php is removed; release_1_2_1 revision 1.4 @@ -54,6 +54,9 @@ File in-portal/kernel/units/general/helpers/mod_rewrite_helper.php changed File in-portal/kernel/units/general/helpers/permissions_helper.php changed File in-portal/kernel/units/users/users_event_handler.php changed +File in-portal/themes/default/search_results.tpl changed +File in-portal/themes/default/common/head.tpl changed +File in-portal/themes/default/common/pagetop.tpl changed File kernel4_dev/kernel4/application.php changed File kernel4_dev/kernel4/event_manager.php changed File kernel4_dev/kernel4/startup.php changed