Changeset 2159

Timestamp:

Nov 2, 2007, 12:08:27 AM (17 years ago)

Author:

rvelices

Message:

merge -r 2158 from branch-1_7 to trunk
fix: in page_header.php U_HOME template var was overwriting the ones from every page -> now it is always make_index_url
fix: unvalidated comments use start end for RSS instead of end only (otherwise google reader creates a new item every time it downloads the feed)

Location:

trunk/include

Files:

• functions_notification.inc.php (modified) (7 diffs)
• page_header.php (modified) (1 diff)

trunk/include/functions_notification.inc.php

@@ -30 +30 @@
 
 /*
- * get standard sql where in order to 
+ * get standard sql where in order to
  * restict an filter caregories and images
  *
@@ -84 +84 @@
       $query = '
   FROM '.COMMENTS_TABLE.'
-  WHERE date <= \''.$end.'\'
-    AND (validated = \'false\'
-         OR validation_date > \''.$end.'\')
+  WHERE date> \''.$start.'\' AND date <= \''.$end.'\'
+    AND validated = \'false\'
 ;';
       break;
@@ -227 +226 @@
  * Comments that are registered and not validated yet on a precise date
  *
- * @param string date (mysql datetime format)
+ * @param string start (mysql datetime format)
+ * @param string end (mysql datetime format)
  * @return count comment ids
  */
-function nb_unvalidated_comments($date)
-{
-  return custom_notification_query('count', 'unvalidated_comments', $date, $date);
-}
-
-/**
- * unvalidated at a precise date
- *
- * Comments that are registered and not validated yet on a precise date
- *
- * @param string date (mysql datetime format)
- * @return array comment ids
- */
-function unvalidated_comments($date)
-{
-  return custom_notification_query('info', 'unvalidated_comments', $start, $end);
-}
+function nb_unvalidated_comments($start, $end)
+{
+  return custom_notification_query('count', 'unvalidated_comments', $start, $end);
+}
+
 
 /**
@@ -363 +351 @@
           (nb_new_elements($start, $end) > 0) or
           (nb_updated_categories($start, $end) > 0) or
-          ((is_admin()) and (nb_unvalidated_comments($end) > 0)) or
+          ((is_admin()) and (nb_unvalidated_comments($start, $end) > 0)) or
           ((is_admin()) and (nb_new_users($start, $end) > 0)) or
           ((is_admin()) and (nb_waiting_elements() > 0))
@@ -425 +413 @@
   {
     add_news_line( $news,
-        nb_unvalidated_comments($end), '%d comment to validate', '%d comments to validate',
+        nb_unvalidated_comments($start, $end), '%d comment to validate', '%d comments to validate',
         get_root_url().'admin.php?page=comments', $add_url );
 
@@ -514 +502 @@
 
 /*
-  Call function get_recent_post_dates but 
+  Call function get_recent_post_dates but
   the parameters to be passed to the function, as an indexed array.
-  
+
 */
 function get_recent_post_dates_array($args)
@@ -539 +527 @@
 
   $description = '';
-  
+
   $description .=
         '<li>'

trunk/include/page_header.php

@@ -54 +54 @@
     'TAG_INPUT_ENABLED' =>
       ((is_adviser()) ? 'disabled onclick="return false;"' : ''),
-    'U_HOME' => get_absolute_root_url(),
+    'U_HOME' => make_index_url(),
     ));