Changeset 11587 for trunk/include/common.inc.php

Timestamp:

Jul 1, 2011, 3:19:35 PM (13 years ago)

Author:

mistic100

Message:

feature:2317 move order config to Admin->Config->Options
new GUI interface for simple paterns
in GUI, order_by and order_by_inside_category are merged (not un DB)
users can define special paterns with $conforder_by_custom and $conforder_by_inside_category_custom

File:

• trunk/include/common.inc.php (modified) (2 diffs)

trunk/include/common.inc.php

@@ -107 +107 @@
   @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');
 
@@ -143 +154 @@
 
 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');