Index: branches/unlabeled/unlabeled-1.37.2/kernel/admin_templates/incs/grid_blocks.tpl =================================================================== diff -u -r6127 -r6321 --- branches/unlabeled/unlabeled-1.37.2/kernel/admin_templates/incs/grid_blocks.tpl (.../grid_blocks.tpl) (revision 6127) +++ branches/unlabeled/unlabeled-1.37.2/kernel/admin_templates/incs/grid_blocks.tpl (.../grid_blocks.tpl) (revision 6321) @@ -170,7 +170,7 @@ - + Index: branches/unlabeled/unlabeled-1.64.2/core/kernel/db/db_tag_processor.php =================================================================== diff -u -r6283 -r6321 --- branches/unlabeled/unlabeled-1.64.2/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 6283) +++ branches/unlabeled/unlabeled-1.64.2/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 6321) @@ -570,7 +570,10 @@ if( !$this->HasParam($params, 'no_special') ) $value = htmlspecialchars($value); if( getArrayValue($params,'checked' ) ) $value = ($value == ( isset($params['value']) ? $params['value'] : 1)) ? 'checked' : ''; - if( getArrayValue($params,'as_label') ) $value = $this->Application->Phrase($value); + if( isset($params['plus_or_as_label']) ) { + $value = substr($value, 0,1) == '+' ? substr($value, 1) : $this->Application->Phrase($value); + } + elseif( getArrayValue($params,'as_label') ) $value = $this->Application->Phrase($value); $first_chars = $this->SelectParam($params,'first_chars,cut_first'); if($first_chars) Index: branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_1_3_0.txt =================================================================== diff -u -r6308 -r6321 --- branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_1_3_0.txt (.../changelog_1_3_0.txt) (revision 6308) +++ branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_1_3_0.txt (.../changelog_1_3_0.txt) (revision 6321) @@ -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.5 +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/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 @@ -37,6 +37,7 @@ File in-portal/kernel/admin/include/toolbar/editgroup_users.php is removed; release_1_2_1 revision 1.1 File in-portal/kernel/admin_templates/incs/config_blocks.tpl changed File in-portal/kernel/admin_templates/incs/form_blocks.tpl changed +File in-portal/kernel/admin_templates/incs/grid_blocks.tpl changed File in-portal/kernel/admin_templates/incs/script.js changed File in-portal/kernel/admin_templates/regional/phrases_edit.tpl changed File in-portal/kernel/admin_templates/tools/system_tools.tpl changed