From 6d0e685b3a5724f60a95d6a0e5ab816f918a8311 Mon Sep 17 00:00:00 2001
From: Claudiu Cristea <clau.cristea@gmail.com>
Date: Wed, 17 Jul 2013 12:39:37 +0300
Subject: [PATCH] Issue #1978630 by claudiu.cristea | escoles: Fixed Error
 when loading linked node.

---
 nodeblock.module |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/nodeblock.module b/nodeblock.module
index 3c0eac7..b37bf4d 100755
--- a/nodeblock.module
+++ b/nodeblock.module
@@ -297,11 +297,11 @@ function nodeblock_form_node_form_alter(&$form, &$form_state) {
  * Check if the machine name already exists.
  */
 function _nodeblock_machine_name_exists($value) {
-  $query = db_select('nodeblock', 'nb')
-    ->condition('machine_name', $value);
-  $query->addExpression('count(*)', 'counts');
-
-  return $query->execute()->fetchColumn() > 0;
+  return (bool) db_select('nodeblock', 'nb')
+    ->condition('machine_name', $value)
+    ->countQuery()
+    ->execute()
+    ->fetchField();
 }
 
 /**
@@ -367,7 +367,8 @@ function nodeblock_node_update($node) {
   $nid = db_select('nodeblock', 'nb')
     ->condition('nid', $node->nid)
     ->fields('nb', array('nid'))
-    ->execute()->fetchColumn();
+    ->execute()
+    ->fetchField();
 
   if ($nid) {
     $values = _nodeblock_defaults($node->type);
@@ -389,7 +390,8 @@ function nodeblock_node_update($node) {
     $old_machine_name = db_select('nodeblock', 'nb')
       ->condition('nid', $node->nid)
       ->fields('nb', array('machine_name'))
-      ->execute()->fetchColumn();
+      ->execute()
+      ->fetchField();
 
     if ($old_machine_name && $old_machine_name != $values['machine_name']) {
       db_update('block')
@@ -498,7 +500,9 @@ function nodeblock_load_nodeblock($machine_name) {
   $nid = db_select('nodeblock', 'nb')
     ->condition('machine_name', $machine_name)
     ->fields('nb', array('nid'))
-    ->execute()->fetchColumn();
+    ->execute()
+    ->fetchField();
+
   if ($nid) {
     return node_load($nid);
   }
-- 
1.7.5.4