Index: branches/5.1.x/units/zones/zones_config.php =================================================================== diff -u -N -r13100 -r13156 --- branches/5.1.x/units/zones/zones_config.php (.../zones_config.php) (revision 13100) +++ branches/5.1.x/units/zones/zones_config.php (.../zones_config.php) (revision 13156) @@ -1,6 +1,6 @@ true, 'hooks' => Array (), 'QueryString' => Array ( - 1 => 'id', - 2 => 'page', - 3 => 'event', + 1 => 'id', + 2 => 'Page', + 3 => 'PerPage', + 4 => 'event', ), 'IDField' => 'ZoneID', 'TitleField' => 'Name', Index: branches/5.1.x/units/pricing/pricing_config.php =================================================================== diff -u -N -r13100 -r13156 --- branches/5.1.x/units/pricing/pricing_config.php (.../pricing_config.php) (revision 13100) +++ branches/5.1.x/units/pricing/pricing_config.php (.../pricing_config.php) (revision 13156) @@ -1,6 +1,6 @@ Array( - 1 => 'id', - 2 => 'page', - 3 => 'event', + 1 => 'id', + 2 => 'Page', + 3 => 'PerPage', + 4 => 'event', ), 'StatusField' => Array('IsPrimary'), 'IDField' => 'PriceId', Index: branches/5.1.x/units/addresses/addresses_config.php =================================================================== diff -u -N -r13147 -r13156 --- branches/5.1.x/units/addresses/addresses_config.php (.../addresses_config.php) (revision 13147) +++ branches/5.1.x/units/addresses/addresses_config.php (.../addresses_config.php) (revision 13156) @@ -1,6 +1,6 @@ Array( - 1 => 'id', - 2 => 'Page', - 3 => 'event', - 4 => 'mode', + 1 => 'id', + 2 => 'Page', + 3 => 'PerPage', + 4 => 'event', + 5 => 'mode', ), 'IDField' => 'AddressId', Index: branches/5.1.x/units/manufacturers/manufacturers_config.php =================================================================== diff -u -N -r13147 -r13156 --- branches/5.1.x/units/manufacturers/manufacturers_config.php (.../manufacturers_config.php) (revision 13147) +++ branches/5.1.x/units/manufacturers/manufacturers_config.php (.../manufacturers_config.php) (revision 13156) @@ -1,6 +1,6 @@ Array( - 1 => 'id', - 2 => 'Page', - 3 => 'event', - 4 => 'mode', + 1 => 'id', + 2 => 'Page', + 3 => 'PerPage', + 4 => 'event', + 5 => 'mode', ), 'IDField' => 'ManufacturerId', 'StatusField' => Array(), Index: branches/5.1.x/units/reports/reports_config.php =================================================================== diff -u -N -r13100 -r13156 --- branches/5.1.x/units/reports/reports_config.php (.../reports_config.php) (revision 13100) +++ branches/5.1.x/units/reports/reports_config.php (.../reports_config.php) (revision 13156) @@ -1,6 +1,6 @@ true, 'QueryString' => Array( - 1 => 'id', - 2 => 'page', - 3 => 'event', - 4 => 'mode', // 't' for temp '' for normal + 1 => 'id', + 2 => 'Page', + 3 => 'PerPage', + 4 => 'event', + 5 => 'mode', ), 'Hooks' => Array( Index: branches/5.1.x/units/shipping/shipping_config.php =================================================================== diff -u -N -r13100 -r13156 --- branches/5.1.x/units/shipping/shipping_config.php (.../shipping_config.php) (revision 13100) +++ branches/5.1.x/units/shipping/shipping_config.php (.../shipping_config.php) (revision 13156) @@ -1,6 +1,6 @@ Array ( - 1 => 'id', - 2 => 'page', - 3 => 'event', - 4 => 'mode', + 1 => 'id', + 2 => 'Page', + 3 => 'PerPage', + 4 => 'event', + 5 => 'mode', ), 'IDField' => 'ShippingID', 'StatusField' => Array ('Status'), @@ -82,7 +83,7 @@ 'Sections' => Array ( 'in-commerce:shipping_folder' => Array ( - 'parent' => 'in-commerce:setting_folder', + 'parent' => 'in-commerce:setting_folder', 'icon' => 'conf_shipping', 'use_parent_header' => 1, 'label' => 'la_tab_Shipping', Index: branches/5.1.x/units/gateway_field_values/gateway_field_values_config.php =================================================================== diff -u -N -r13100 -r13156 --- branches/5.1.x/units/gateway_field_values/gateway_field_values_config.php (.../gateway_field_values_config.php) (revision 13100) +++ branches/5.1.x/units/gateway_field_values/gateway_field_values_config.php (.../gateway_field_values_config.php) (revision 13156) @@ -1,6 +1,6 @@ false, 'hooks' => Array(), 'QueryString' => Array( - 1 => 'id', - 2 => 'page', - 3 => 'event', + 1 => 'id', + 2 => 'Page', + 3 => 'PerPage', + 4 => 'event', ), 'IDField' => 'GWConfigValueId', 'TableName' => TABLE_PREFIX.'GatewayConfigValues', Index: branches/5.1.x/units/discount_items/discount_items_config.php =================================================================== diff -u -N -r13100 -r13156 --- branches/5.1.x/units/discount_items/discount_items_config.php (.../discount_items_config.php) (revision 13100) +++ branches/5.1.x/units/discount_items/discount_items_config.php (.../discount_items_config.php) (revision 13156) @@ -1,6 +1,6 @@ Array( - 1 => 'id', - 2 => 'page', - 3 => 'event', + 1 => 'id', + 2 => 'Page', + 3 => 'PerPage', + 4 => 'event', ), 'IDField' => 'DiscountItemId', 'StatusField' => Array('Status'), Index: branches/5.1.x/units/affiliate_plans_brackets/affiliate_plans_brackets_config.php =================================================================== diff -u -N -r13100 -r13156 --- branches/5.1.x/units/affiliate_plans_brackets/affiliate_plans_brackets_config.php (.../affiliate_plans_brackets_config.php) (revision 13100) +++ branches/5.1.x/units/affiliate_plans_brackets/affiliate_plans_brackets_config.php (.../affiliate_plans_brackets_config.php) (revision 13156) @@ -1,6 +1,6 @@ Array( - 1 => 'id', - 2 => 'Page', - 3 => 'event', + 1 => 'id', + 2 => 'Page', + 3 => 'PerPage', + 4 => 'event', ), 'IDField' => 'AffiliateBracketId', Index: branches/5.1.x/units/products/products_config.php =================================================================== diff -u -N -r13100 -r13156 --- branches/5.1.x/units/products/products_config.php (.../products_config.php) (revision 13100) +++ branches/5.1.x/units/products/products_config.php (.../products_config.php) (revision 13156) @@ -1,6 +1,6 @@ Array( 1 => 'id', 2 => 'Page', - 3 => 'event', - 4 => 'mode', + 3 => 'PerPage', + 4 => 'event', + 5 => 'mode', ), 'CatalogItem' => true, Index: branches/5.1.x/units/affiliates/affiliates_config.php =================================================================== diff -u -N -r13100 -r13156 --- branches/5.1.x/units/affiliates/affiliates_config.php (.../affiliates_config.php) (revision 13100) +++ branches/5.1.x/units/affiliates/affiliates_config.php (.../affiliates_config.php) (revision 13156) @@ -1,6 +1,6 @@ Array( - 1 => 'id', - 2 => 'Page', - 3 => 'event', - 4 => 'mode', + 1 => 'id', + 2 => 'Page', + 3 => 'PerPage', + 4 => 'event', + 5 => 'mode', ), 'RegularEvents' => Array( Index: branches/5.1.x/units/taxesdestinations/taxesdestinations_config.php =================================================================== diff -u -N -r13100 -r13156 --- branches/5.1.x/units/taxesdestinations/taxesdestinations_config.php (.../taxesdestinations_config.php) (revision 13100) +++ branches/5.1.x/units/taxesdestinations/taxesdestinations_config.php (.../taxesdestinations_config.php) (revision 13156) @@ -1,6 +1,6 @@ true, 'hooks' => Array(), 'QueryString' => Array( - 1 => 'id', - 2 => 'page', - 3 => 'event', + 1 => 'id', + 2 => 'Page', + 3 => 'PerPage', + 4 => 'event', ), 'Hooks' => Array( Index: branches/5.1.x/units/product_option_combinations/product_option_combinations_config.php =================================================================== diff -u -N -r13100 -r13156 --- branches/5.1.x/units/product_option_combinations/product_option_combinations_config.php (.../product_option_combinations_config.php) (revision 13100) +++ branches/5.1.x/units/product_option_combinations/product_option_combinations_config.php (.../product_option_combinations_config.php) (revision 13156) @@ -1,6 +1,6 @@ Array( ), 'QueryString' => Array( - 1 => 'id', - 2 => 'page', - 3 => 'event', + 1 => 'id', + 2 => 'Page', + 3 => 'PerPage', + 4 => 'event', ), 'TitleField' => 'CombinationId', 'IDField' => 'CombinationId', Index: branches/5.1.x/units/payment_type_currencies/payment_type_currencies_config.php =================================================================== diff -u -N -r13100 -r13156 --- branches/5.1.x/units/payment_type_currencies/payment_type_currencies_config.php (.../payment_type_currencies_config.php) (revision 13100) +++ branches/5.1.x/units/payment_type_currencies/payment_type_currencies_config.php (.../payment_type_currencies_config.php) (revision 13156) @@ -1,6 +1,6 @@ true, 'hooks' => Array(), 'QueryString' => Array( - 1 => 'id', - 2 => 'page', - 3 => 'event', - 4 => 'mode', + 1 => 'id', + 2 => 'Page', + 3 => 'PerPage', + 4 => 'event', + 5 => 'mode', ), 'Hooks' => Array( Index: branches/5.1.x/units/affiliate_plans_items/affiliate_plans_items_config.php =================================================================== diff -u -N -r13100 -r13156 --- branches/5.1.x/units/affiliate_plans_items/affiliate_plans_items_config.php (.../affiliate_plans_items_config.php) (revision 13100) +++ branches/5.1.x/units/affiliate_plans_items/affiliate_plans_items_config.php (.../affiliate_plans_items_config.php) (revision 13156) @@ -1,6 +1,6 @@ Array( - 1 => 'id', - 2 => 'page', - 3 => 'event', + 1 => 'id', + 2 => 'Page', + 3 => 'PerPage', + 4 => 'event', ), 'IDField' => 'AffiliateItemId', 'StatusField' => Array('Status'), Index: branches/5.1.x/units/taxes/taxes_config.php =================================================================== diff -u -N -r13100 -r13156 --- branches/5.1.x/units/taxes/taxes_config.php (.../taxes_config.php) (revision 13100) +++ branches/5.1.x/units/taxes/taxes_config.php (.../taxes_config.php) (revision 13156) @@ -1,6 +1,6 @@ true, 'hooks' => Array (), 'QueryString' => Array ( - 1 => 'id', - 2 => 'page', - 3 => 'event', - 4 => 'mode', + 1 => 'id', + 2 => 'Page', + 3 => 'PerPage', + 4 => 'event', + 5 => 'mode', ), /*'Hooks' => Array ( Index: branches/5.1.x/units/affiliate_plans/affiliate_plans_config.php =================================================================== diff -u -N -r13100 -r13156 --- branches/5.1.x/units/affiliate_plans/affiliate_plans_config.php (.../affiliate_plans_config.php) (revision 13100) +++ branches/5.1.x/units/affiliate_plans/affiliate_plans_config.php (.../affiliate_plans_config.php) (revision 13156) @@ -1,6 +1,6 @@ Array( ), 'QueryString' => Array( - 1 => 'id', - 2 => 'Page', - 3 => 'event', - 4 => 'mode', + 1 => 'id', + 2 => 'Page', + 3 => 'PerPage', + 4 => 'event', + 5 => 'mode', ), 'IDField' => 'AffiliatePlanId', Index: branches/5.1.x/units/files/files_config.php =================================================================== diff -u -N -r13100 -r13156 --- branches/5.1.x/units/files/files_config.php (.../files_config.php) (revision 13100) +++ branches/5.1.x/units/files/files_config.php (.../files_config.php) (revision 13156) @@ -1,6 +1,6 @@ Array( - 1 => 'id', - 2 => 'page', - 3 => 'event', + 1 => 'id', + 2 => 'Page', + 3 => 'PerPage', + 4 => 'event', ), 'StatusField' => Array('Status', 'IsPrimary'), 'IDField' => 'FileId', Index: branches/5.1.x/units/discounts/discounts_config.php =================================================================== diff -u -N -r13100 -r13156 --- branches/5.1.x/units/discounts/discounts_config.php (.../discounts_config.php) (revision 13100) +++ branches/5.1.x/units/discounts/discounts_config.php (.../discounts_config.php) (revision 13156) @@ -1,6 +1,6 @@ true, 'hooks' => Array(), 'QueryString' => Array( - 1 => 'id', - 2 => 'page', - 3 => 'event', - 4 => 'mode', // 't' for temp '' for normal + 1 => 'id', + 2 => 'Page', + 3 => 'PerPage', + 4 => 'event', + 5 => 'mode', ), 'IDField' => 'DiscountId', 'StatusField' => Array('Status'), Index: branches/5.1.x/units/shipping_costs/shipping_costs_config.php =================================================================== diff -u -N -r13100 -r13156 --- branches/5.1.x/units/shipping_costs/shipping_costs_config.php (.../shipping_costs_config.php) (revision 13100) +++ branches/5.1.x/units/shipping_costs/shipping_costs_config.php (.../shipping_costs_config.php) (revision 13156) @@ -1,6 +1,6 @@ Array( - 1 => 'id', - 2 => 'page', - 3 => 'event', + 1 => 'id', + 2 => 'Page', + 3 => 'PerPage', + 4 => 'event', ), 'IDField' => 'ShippingCostId', 'TableName' => TABLE_PREFIX.'ShippingCosts', Index: branches/5.1.x/units/orders/orders_config.php =================================================================== diff -u -N -r13147 -r13156 --- branches/5.1.x/units/orders/orders_config.php (.../orders_config.php) (revision 13147) +++ branches/5.1.x/units/orders/orders_config.php (.../orders_config.php) (revision 13156) @@ -1,6 +1,6 @@ Array( - 1 => 'id', - 2 => 'Page', - 3 => 'event', - 4 => 'mode', + 1 => 'id', + 2 => 'Page', + 3 => 'PerPage', + 4 => 'event', + 5 => 'mode', ), 'IDField' => 'OrderId', 'StatusField' => Array('Status'), // field, that is affected by Approve/Decline events Index: branches/5.1.x/units/brackets/brackets_config.php =================================================================== diff -u -N -r13100 -r13156 --- branches/5.1.x/units/brackets/brackets_config.php (.../brackets_config.php) (revision 13100) +++ branches/5.1.x/units/brackets/brackets_config.php (.../brackets_config.php) (revision 13156) @@ -1,6 +1,6 @@ Array( - 1 => 'id', - 2 => 'page', - 3 => 'event', + 1 => 'id', + 2 => 'Page', + 3 => 'PerPage', + 4 => 'event', ), 'IDField' => 'BracketId', 'TableName' => TABLE_PREFIX.'ShippingBrackets', Index: branches/5.1.x/units/currencies/currencies_config.php =================================================================== diff -u -N -r13147 -r13156 --- branches/5.1.x/units/currencies/currencies_config.php (.../currencies_config.php) (revision 13147) +++ branches/5.1.x/units/currencies/currencies_config.php (.../currencies_config.php) (revision 13156) @@ -1,6 +1,6 @@ true, 'hooks' => Array (), 'QueryString' => Array ( - 1 => 'id', - 2 => 'page', - 3 => 'event', - 4 => 'mode', + 1 => 'id', + 2 => 'Page', + 3 => 'PerPage', + 4 => 'event', + 5 => 'mode', ), /*'Hooks' => Array ( Index: branches/5.1.x/units/destinations/destinations_config.php =================================================================== diff -u -N -r13100 -r13156 --- branches/5.1.x/units/destinations/destinations_config.php (.../destinations_config.php) (revision 13100) +++ branches/5.1.x/units/destinations/destinations_config.php (.../destinations_config.php) (revision 13156) @@ -1,6 +1,6 @@ Array( - 1 => 'id', - 2 => 'page', - 3 => 'event', + 1 => 'id', + 2 => 'Page', + 3 => 'PerPage', + 4 => 'event', ), 'IDField' => 'ZoneDestId', 'TableName' => TABLE_PREFIX.'ShippingZonesDestinations', Index: branches/5.1.x/units/coupon_items/coupon_items_config.php =================================================================== diff -u -N -r13100 -r13156 --- branches/5.1.x/units/coupon_items/coupon_items_config.php (.../coupon_items_config.php) (revision 13100) +++ branches/5.1.x/units/coupon_items/coupon_items_config.php (.../coupon_items_config.php) (revision 13156) @@ -1,6 +1,6 @@ Array( - 1 => 'id', - 2 => 'page', - 3 => 'event', + 1 => 'id', + 2 => 'Page', + 3 => 'PerPage', + 4 => 'event', ), 'IDField' => 'CouponItemId', 'StatusField' => Array('Status'), Index: branches/5.1.x/units/affiliate_payments/affiliate_payments_config.php =================================================================== diff -u -N -r13100 -r13156 --- branches/5.1.x/units/affiliate_payments/affiliate_payments_config.php (.../affiliate_payments_config.php) (revision 13100) +++ branches/5.1.x/units/affiliate_payments/affiliate_payments_config.php (.../affiliate_payments_config.php) (revision 13156) @@ -1,6 +1,6 @@ Array( - 1 => 'id', - 2 => 'Page', - 3 => 'event', + 1 => 'id', + 2 => 'Page', + 3 => 'PerPage', + 4 => 'event', ), 'IDField' => 'AffiliatePaymentId', Index: branches/5.1.x/units/shipping_quote_engines/shipping_quote_engines_config.php =================================================================== diff -u -N -r13100 -r13156 --- branches/5.1.x/units/shipping_quote_engines/shipping_quote_engines_config.php (.../shipping_quote_engines_config.php) (revision 13100) +++ branches/5.1.x/units/shipping_quote_engines/shipping_quote_engines_config.php (.../shipping_quote_engines_config.php) (revision 13156) @@ -1,6 +1,6 @@ Array ( ), 'QueryString' => Array ( - 1 => 'id', - 2 => 'page', - 3 => 'event', - 4 => 'mode', + 1 => 'id', + 2 => 'Page', + 3 => 'PerPage', + 4 => 'event', + 5 => 'mode', ), 'IDField' => 'EngineId', 'StatusField' => Array ('Status'), Index: branches/5.1.x/units/order_items/order_items_config.php =================================================================== diff -u -N -r13100 -r13156 --- branches/5.1.x/units/order_items/order_items_config.php (.../order_items_config.php) (revision 13100) +++ branches/5.1.x/units/order_items/order_items_config.php (.../order_items_config.php) (revision 13156) @@ -1,6 +1,6 @@ Array ( 1 => 'id', - 2 => 'page', - 3 => 'event', + 2 => 'Page', + 3 => 'PerPage', + 4 => 'event', ), 'IDField' => 'OrderItemId', Index: branches/5.1.x/units/payment_type/payment_type_config.php =================================================================== diff -u -N -r13100 -r13156 --- branches/5.1.x/units/payment_type/payment_type_config.php (.../payment_type_config.php) (revision 13100) +++ branches/5.1.x/units/payment_type/payment_type_config.php (.../payment_type_config.php) (revision 13156) @@ -1,6 +1,6 @@ true, 'QueryString' => Array ( - 1 => 'id', - 2 => 'page', - 3 => 'event', - 4 => 'mode', + 1 => 'id', + 2 => 'Page', + 3 => 'PerPage', + 4 => 'event', + 5 => 'mode', ), 'IDField' => 'PaymentTypeId', 'StatusField' => Array ('Status', 'IsPrimary'), Index: branches/5.1.x/units/gateways/gateways_config.php =================================================================== diff -u -N -r13100 -r13156 --- branches/5.1.x/units/gateways/gateways_config.php (.../gateways_config.php) (revision 13100) +++ branches/5.1.x/units/gateways/gateways_config.php (.../gateways_config.php) (revision 13156) @@ -1,6 +1,6 @@ Array( - 1 => 'id', - 2 => 'page', - 3 => 'event', + 1 => 'id', + 2 => 'Page', + 3 => 'PerPage', + 4 => 'event', ), 'IDField' => 'GWConfigFieldId', 'TableName' => TABLE_PREFIX.'GatewayConfigFields', Index: branches/5.1.x/units/product_options/product_options_config.php =================================================================== diff -u -N -r13100 -r13156 --- branches/5.1.x/units/product_options/product_options_config.php (.../product_options_config.php) (revision 13100) +++ branches/5.1.x/units/product_options/product_options_config.php (.../product_options_config.php) (revision 13156) @@ -1,6 +1,6 @@ Array( - 1 => 'id', - 2 => 'page', - 3 => 'event', + 1 => 'id', + 2 => 'Page', + 3 => 'PerPage', + 4 => 'event', ), 'TitleField' => 'Name', 'IDField' => 'ProductOptionId', Index: branches/5.1.x/units/affiliate_payment_types/affiliate_payment_types_config.php =================================================================== diff -u -N -r13100 -r13156 --- branches/5.1.x/units/affiliate_payment_types/affiliate_payment_types_config.php (.../affiliate_payment_types_config.php) (revision 13100) +++ branches/5.1.x/units/affiliate_payment_types/affiliate_payment_types_config.php (.../affiliate_payment_types_config.php) (revision 13156) @@ -1,6 +1,6 @@ Array( - 1 => 'id', - 2 => 'Page', - 3 => 'event', - 4 => 'mode', + 1 => 'id', + 2 => 'Page', + 3 => 'PerPage', + 4 => 'event', + 5 => 'mode', ), 'IDField' => 'PaymentTypeId', Index: branches/5.1.x/units/coupons/coupons_config.php =================================================================== diff -u -N -r13100 -r13156 --- branches/5.1.x/units/coupons/coupons_config.php (.../coupons_config.php) (revision 13100) +++ branches/5.1.x/units/coupons/coupons_config.php (.../coupons_config.php) (revision 13156) @@ -1,6 +1,6 @@ Array( - 1 => 'id', - 2 => 'page', - 3 => 'event', - 4 => 'mode', // 't' for temp '' for normal + 1 => 'id', + 2 => 'Page', + 3 => 'PerPage', + 4 => 'event', + 5 => 'mode', ), 'IDField' => 'CouponId', 'StatusField' => Array('Status'), Index: branches/5.1.x/units/downloads/downloads_config.php =================================================================== diff -u -N -r13100 -r13156 --- branches/5.1.x/units/downloads/downloads_config.php (.../downloads_config.php) (revision 13100) +++ branches/5.1.x/units/downloads/downloads_config.php (.../downloads_config.php) (revision 13156) @@ -1,6 +1,6 @@ Array( - 1 => 'id', - 2 => 'page', - 3 => 'event', + 1 => 'id', + 2 => 'Page', + 3 => 'PerPage', + 4 => 'event', + 5 => 'mode', ), 'TitlePresets' => Array( 'downloads_list'=>Array( 'prefixes' => Array('down_List'), Index: branches/5.1.x/units/gift_certificates/gift_certificates_config.php =================================================================== diff -u -N -r13147 -r13156 --- branches/5.1.x/units/gift_certificates/gift_certificates_config.php (.../gift_certificates_config.php) (revision 13147) +++ branches/5.1.x/units/gift_certificates/gift_certificates_config.php (.../gift_certificates_config.php) (revision 13156) @@ -1,6 +1,6 @@ Array ( - 1 => 'id', - 2 => 'page', - 3 => 'event', - 4 => 'mode', + 1 => 'id', + 2 => 'Page', + 3 => 'PerPage', + 4 => 'event', + 5 => 'mode', ), 'IDField' => 'GiftCertificateId',