diff --git a/lqdn_rp.info b/lqdn_rp.info
index 96b64c84ea1783007de481afcfab70a9c8326a8c..30fa3b7e080c786bfcc39bde42774c88cd0aa069 100644
--- a/lqdn_rp.info
+++ b/lqdn_rp.info
@@ -1,5 +1,5 @@
 ; $Id$
 name = "Modifie le champ date pour la revue de presse"
 description = Modifie le champ date pour la revue de presse
-core = 6.x
+core = 7.x
 package = "La Quadrature"
diff --git a/lqdn_rp.module b/lqdn_rp.module
index c33cd2f0313e372abcb016d0cebfce1bc149d1b7..0ba1ca92d3a2c62300aa1d9b101dd7f9aa632b1b 100644
--- a/lqdn_rp.module
+++ b/lqdn_rp.module
@@ -25,35 +25,33 @@ function lqdn_rp_date_submit($form, &$form_state) {
   unset($form_state['values']['date_time']);
 }
 
-function lqdn_rp_db_rewrite_sql($query, $primary_table, $primary_field, $args) {
-  if ($primary_table == 'n' && $primary_field == 'nid' &&
-      substr($_GET['q'], 0, 14)  == 'taxonomy/term/') {
+function lqdn_rp_query_alter($query) {
+  // If node access
+  if ($query->hasTag('node_access') && substr($_GET['q'], 0, 14)  == 'taxonomy/term/') {
     $rp= trim($_GET['rp']);
     switch ($rp)
       {
       case 'only':
-        $return['where'] = "n.type = 'revue_de_presse'";
-	return $return;
+        $query->where("n.type=:n_type", array("n_type"=>"revue_de_presse"));
         break;
       case 'yes':
         break;
       default:
-        $return['where'] = "n.type <> 'revue_de_presse'";
-	return $return;
+        $query->where("n.type <> :n_type", array("n_type"=>"revue_de_presse"));
       }
   }
 }
 
-function lqdn_rp_block ($op = 'list', $delta = 0, $edit = array()) {
-  if ($op == 'list') {
+function lqdn_rp_block_list_alter (&$blocks) {
+    //t: Revue de presse d'une étiquette
     $blocks[0]['info'] = t('Press Review of a tag');
     $blocks[0]['region'] = 'region-right';
     $blocks[0]['visibility'] = 1;
     $blocks[0]['pages'] = 'taxonomy/term/*';
-    //t: Revue de presse d'une étiquette
-    return $blocks;
-  }
-  elseif ($op == 'view' && $delta == 0 && substr($_GET['q'], 0, 14) == 'taxonomy/term/') {
+}
+
+function lqdn_rp_block_view ($delta = '') {
+  if ($delta == '' && substr($_GET['q'], 0, 14) == 'taxonomy/term/') {
     $tid = intval(substr($_GET['q'], 14));
     if ($tid > 0) {
       $dossier = new stdClass;