From e53f58fbe0e6c033fce65bd0d7a76d25911ff158 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Wed, 14 Dec 2005 20:01:39 +0000
Subject: [PATCH] - Patch #40631 by Chris Johnson: is_array() slower than
isset() or empty().
---
database/updates.inc | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/database/updates.inc b/database/updates.inc
index a44580c18521..5ae65e6aac64 100644
--- a/database/updates.inc
+++ b/database/updates.inc
@@ -943,13 +943,13 @@ function system_update_151() {
// insert all entries from theme links into new menus
$num_inserted = 0;
- if (is_array($ts) && is_array($ts[$menus[$loop]['links_var']])) {
+ if (isset($ts) && is_array($ts) && is_array($ts[$menus[$loop]['links_var']])) {
$links = $ts[$menus[$loop]['links_var']];
for ($i = 0; $i < count($links['text']); $i++) {
if ($links['text'][$i] != "" && $links['link'][$i] != "") {
$num_inserted ++;
$node_unalias = db_fetch_array(db_query("SELECT src FROM {url_alias} WHERE dst = '%s'", $links['link'][$i]));
- if (is_array($node_unalias)) {
+ if (isset($node_unalias) && is_array($node_unalias)) {
$link_path = $node_unalias['src'];
}
else {
@@ -984,7 +984,7 @@ function system_update_151() {
unset($ts[$menus[$loop]['more_var']]);
}
- if (is_array($ts)) {
+ if (isset($ts) && is_array($ts)) {
variable_set('theme_settings', $ts);
}
@@ -1118,7 +1118,7 @@ function system_update_159() {
$vid = db_next_id('{node_revisions}_vid');
while ($node = db_fetch_object($result)) {
$revisions = unserialize($node->revisions);
- if (is_array($revisions) && count($revisions) > 0) {
+ if (!$revisions && is_array($revisions) && count($revisions) > 0) {
$revisions_query = array();
$revisions_args = array();
$book_query = array();
--
GitLab