aboutsummaryrefslogtreecommitdiffstats
path: root/include/common.inc.php
diff options
context:
space:
mode:
Diffstat (limited to 'include/common.inc.php')
-rw-r--r--include/common.inc.php21
1 files changed, 21 insertions, 0 deletions
diff --git a/include/common.inc.php b/include/common.inc.php
index 6081220e6..f28a27eb6 100644
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -106,6 +106,17 @@ if (isset($conf['local_dir_site']))
{
@include(PHPWG_ROOT_PATH.PWG_LOCAL_DIR. 'config/config.inc.php');
}
+
+// that's for migration from 2.2, will be deprecated in 2.4
+if (isset($conf['order_by']))
+{
+ $conf['order_by_custom'] = $conf['order_by'];
+}
+if (isset($conf['order_by_inside_category']))
+{
+ $conf['order_by_inside_category_custom'] = $conf['order_by_inside_category'];
+}
+
include(PHPWG_ROOT_PATH .'include/dblayer/functions_'.$conf['dblayer'].'.inc.php');
if(isset($conf['show_php_errors']) && !empty($conf['show_php_errors']))
@@ -143,6 +154,16 @@ if (!$conf['check_upgrade_feed'])
load_plugins();
+// users can have defined a custom order pattern, incompatible with GUI form
+if (isset($conf['order_by_custom']))
+{
+ $conf['order_by'] = $conf['order_by_custom'];
+}
+if (isset($conf['order_by_inside_category_custom']))
+{
+ $conf['order_by_inside_category'] = $conf['order_by_inside_category_custom'];
+}
+
include(PHPWG_ROOT_PATH.'include/user.inc.php');
if (in_array( substr($user['language'],0,2), array('fr','it','de','es','pl','hu','ru','nl') ) )