Index: branches/RC/core/install/upgrades.sql
===================================================================
diff -u -N -r11650 -r11662
--- branches/RC/core/install/upgrades.sql (.../upgrades.sql) (revision 11650)
+++ branches/RC/core/install/upgrades.sql (.../upgrades.sql) (revision 11662)
@@ -1310,5 +1310,9 @@
ALTER TABLE ThemeFiles ADD FileMetaInfo TEXT NULL;
+UPDATE SearchConfig
+SET SimpleSearch = 0
+WHERE FieldType NOT IN ('text', 'range') AND SimpleSearch = 1;
+
DELETE FROM Modules WHERE Name = 'Proj-Base';
UPDATE Modules SET Version = '5.0.0', Loaded = 1 WHERE Name = 'In-Portal';
\ No newline at end of file
Index: branches/RC/core/kernel/db/db_event_handler.php
===================================================================
diff -u -N -r11653 -r11662
--- branches/RC/core/kernel/db/db_event_handler.php (.../db_event_handler.php) (revision 11653)
+++ branches/RC/core/kernel/db/db_event_handler.php (.../db_event_handler.php) (revision 11662)
@@ -905,7 +905,7 @@
$cur_sort1 = $this->Application->RecallVar($event->Prefix_Special.'_Sort1');
$cur_sort1_dir = $this->Application->RecallVar($event->Prefix_Special.'_Sort1_Dir');
- $use_double_sorting = $this->Application->ConfigValue('UseDoubleSorting') !== false ? $this->Application->ConfigValue('UseDoubleSorting') : true;
+ $use_double_sorting = $this->Application->ConfigValue('UseDoubleSorting');
if ($use_double_sorting) {
$cur_sort2 = $this->Application->RecallVar($event->Prefix_Special.'_Sort2');
@@ -1862,33 +1862,8 @@
function finalizePopup(&$event)
{
$event->SetRedirectParam('opener', 'u');
-
-
-
- /*return ;
-
- // 2. substitute opener
- $opener_stack = $this->Application->RecallVar('opener_stack');
- $opener_stack = $opener_stack ? unserialize($opener_stack) : Array();
- //array_pop($opener_stack);
-
- $t = $this->Application->RecallVar('return_template');
- $this->Application->RemoveVar('return_template');
-
- // restore original "m" prefix all params, that have values before opening selector
- $return_m = $this->Application->RecallVar('return_m');
- $this->Application->RemoveVar('return_m');
- $this->Application->HttpQuery->parseEnvPart($return_m);
-
- $pass_events = $event->getEventParam('pass_events');
- $redirect_params = array_merge_recursive2($event->redirect_params, Array('m_opener' => 'u', '__URLENCODE__' => 1));
-
- $new_level = 'index.php|'.ltrim($this->Application->BuildEnv($t, $redirect_params, 'all', $pass_events), ENV_VAR_NAME.'=');
- array_push($opener_stack, $new_level);
- $this->Application->StoreVar('opener_stack', serialize($opener_stack));*/
}
-
/**
* Create search filters based on search query
*
Index: branches/RC/core/admin_templates/config/config_search.tpl
===================================================================
diff -u -N -r11623 -r11662
--- branches/RC/core/admin_templates/config/config_search.tpl (.../config_search.tpl) (revision 11623)
+++ branches/RC/core/admin_templates/config/config_search.tpl (.../config_search.tpl) (revision 11662)
@@ -68,10 +68,18 @@
-
[ID: ; DisplayOrder: ; Field: ]
+
[ID: ; DisplayOrder: ; Field: ]
|
-
+
+
+
+
+
+
+ |
+
+
Index: branches/RC/core/units/general/helpers/permissions_helper.php
===================================================================
diff -u -N -r11610 -r11662
--- branches/RC/core/units/general/helpers/permissions_helper.php (.../permissions_helper.php) (revision 11610)
+++ branches/RC/core/units/general/helpers/permissions_helper.php (.../permissions_helper.php) (revision 11662)
@@ -198,7 +198,7 @@
}
else {
$new_item = $this->Application->IsAdmin() && $event_handler->isNewItemCreate($event) ? true : false;
- $check_status = $this->checkCombinedPermissions($event, $owner_id, $category_id, $new_item);
+ $check_status = $this->checkCombinedPermissions($event, $owner_id, (int)$category_id, $new_item);
}
if (isset($check_status)) {
@@ -222,7 +222,7 @@
continue;
}
$perm_name = $item_prefix.'.'.$perm_mapping[$perm_name];
- $perm_status = $this->CheckPermission($perm_name, 0, $category_id);
+ $perm_status = $this->CheckPermission($perm_name, 0, (int)$category_id);
if ($perm_status) {
return $perm_status;
Index: branches/RC/core/kernel/db/db_tag_processor.php
===================================================================
diff -u -N -r11576 -r11662
--- branches/RC/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 11576)
+++ branches/RC/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 11662)
@@ -1272,7 +1272,7 @@
{
return strtolower($list->GetOrderDirection($user_sorting_start));
}
- elseif($list->GetOrderField($user_sorting_start+1) == $field)
+ elseif($this->Application->ConfigValue('UseDoubleSorting') && $list->GetOrderField($user_sorting_start+1) == $field)
{
return '2_'.strtolower($list->GetOrderDirection($user_sorting_start+1));
}
Index: branches/RC/core/admin_templates/categories/categories_tabs.tpl
===================================================================
diff -u -N -r11538 -r11662
--- branches/RC/core/admin_templates/categories/categories_tabs.tpl (.../categories_tabs.tpl) (revision 11538)
+++ branches/RC/core/admin_templates/categories/categories_tabs.tpl (.../categories_tabs.tpl) (revision 11662)
@@ -1,5 +1,5 @@
- style="display: none;">
+