Changeset 4781 for trunk/include/calendar_base.class.php

Timestamp:

Jan 28, 2010, 12:30:36 PM (14 years ago)

Author:

nikrou

Message:

Feature 511 : add support for sqlite database engine

Using session_write_close function when session handler use database because write is called after object destruction.

File:

• trunk/include/calendar_base.class.php (modified) (3 diffs)

trunk/include/calendar_base.class.php

@@ -272 +272 @@
       return;
     
-    $sub_query = '';
+    $sub_queries = array();
     $nb_elements = count($page['chronology_date']);
     for ($i=0; $i<$nb_elements; $i++)
@@ -278 +278 @@
       if ( 'any' === $page['chronology_date'][$i] )
       {
-        $sub_query .= '\'any\'';
+        $sub_queries[] = '\'any\'';
       }
       else
       {
-        $sub_query .= pwg_db_cast_to_text($this->calendar_levels[$i]['sql']);
-      }
-      if ($i<($nb_elements-1))
-      {
-        $sub_query .= ',';
-      }
-    }
-    $query = 'SELECT '.pwg_db_concat_ws($sub_query, '-').' AS period';
+        $sub_queries[] = pwg_db_cast_to_text($this->calendar_levels[$i]['sql']);
+      }
+    }
+    $query = 'SELECT '.pwg_db_concat_ws($sub_queries, '-').' AS period';
     $query .= $this->inner_sql .'
 AND ' . $this->date_field . ' IS NOT NULL
@@ -297 +293 @@
     $upper_items = array_from_query( $query, 'period');
 
-    usort($upper_items, 'version_compare');
+    usort($upper_items, 'date_compare');
     $upper_items_rank = array_flip($upper_items);
     if ( !isset($upper_items_rank[$current]) )
     {
       array_push($upper_items, $current);// just in case (external link)
-      usort($upper_items, 'version_compare');
+      usort($upper_items, 'date_compare');
       $upper_items_rank = array_flip($upper_items);
     }