Index: panels_mini/panels_mini.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/panels/panels_mini/Attic/panels_mini.module,v
retrieving revision 1.1.2.28
diff -u -p -r1.1.2.28 panels_mini.module
--- panels_mini/panels_mini.module	29 May 2008 23:32:10 -0000	1.1.2.28
+++ panels_mini/panels_mini.module	4 Jun 2008 22:05:37 -0000
@@ -966,42 +966,45 @@ function panels_mini_sanitize($mini) {
 function panels_mini_load_all($page_size = 0) {
   static $results = array();
 
-  if (!isset($results[$page_size])) {
-    $panels = $dids = array();
-    $query = "SELECT * FROM {panels_mini}";
-    if ($page_size) {
-      $result = pager_query($query, $page_size);
-    }
-    else {
-      $result = db_query($query);
-    }
+  if (array_key_exists($page_size, $results)) {
+    return $results[$page_size];
+  }
 
-    while ($mini = db_fetch_object($result)) {
-      $mini->contexts = (!empty($mini->contexts)) ? unserialize($mini->contexts) : array();
-      $mini->requiredcontexts = (!empty($mini->requiredcontexts)) ? unserialize($mini->requiredcontexts) : array();
-      $mini->relationships = (!empty($mini->relationships)) ? unserialize($mini->relationships) : array();
+  $panels = $dids = array();
+  $query = "SELECT * FROM {panels_mini}";
+  if ($page_size) {
+    $result = pager_query($query, $page_size);
+  }
+  else {
+    $result = db_query($query);
+  }
 
-      $mini->type = t('Local');
-      $panels[$mini->name] = panels_mini_sanitize($mini);
-    }
+  while ($mini = db_fetch_object($result)) {
+    $mini->contexts = (!empty($mini->contexts)) ? unserialize($mini->contexts) : array();
+    $mini->requiredcontexts = (!empty($mini->requiredcontexts)) ? unserialize($mini->requiredcontexts) : array();
+    $mini->relationships = (!empty($mini->relationships)) ? unserialize($mini->relationships) : array();
 
-    $status = variable_get('panel_mini_defaults', array());
-    foreach (panels_mini_default_panels() as $mini) {
-      // Determine if default panel is enabled or disabled.
-      if (isset($status[$mini->name])) {
-        $mini->disabled = $status[$mini->name];
-      }
+    $mini->type = t('Local');
+    $panels[$mini->name] = panels_mini_sanitize($mini);
+  }
 
-      if (!empty($panels[$mini->name])) {
-        $panels[$mini->name]->type = t('Overridden');
-      }
-      else {
-        $mini->type = t('Default');
-        $panels[$mini->name] = $mini;
-      }
+  $status = variable_get('panel_mini_defaults', array());
+  foreach (panels_mini_default_panels() as $mini) {
+    // Determine if default panel is enabled or disabled.
+    if (isset($status[$mini->name])) {
+      $mini->disabled = $status[$mini->name];
+    }
+
+    if (!empty($panels[$mini->name])) {
+      $panels[$mini->name]->type = t('Overridden');
+    }
+    else {
+      $mini->type = t('Default');
+      $panels[$mini->name] = $mini;
     }
-    $results[$page_size] = $panels;
   }
+  $results[$page_size] = $panels;
+
   return $results[$page_size];
 }
 
@@ -1010,37 +1013,40 @@ function panels_mini_load_all($page_size
  */
 function panels_mini_load($pid) {
   static $cache = array();
-  if (!array_key_exists($pid, $cache)) {
-    if (!is_numeric($pid)) {
-      $where = "name = '%s'";
-    }
-    else {
-      $where = 'pid = %d';
-    }
-    $mini = db_fetch_object(db_query("SELECT * FROM {panels_mini} WHERE $where", $pid));
-    if (!$mini) {
-      $defaults = panels_mini_default_panels();
-      if (isset($defaults[$pid])) {
-        $mini = $defaults[$pid];
-        $status = variable_get('panel_mini_defaults', array());
-        // Determine if default panel is enabled or disabled.
-        if (isset($status[$mini->name])) {
-          $mini->disabled = $status[$mini->name];
-        }
-        $cache[$pid] = $mini;
-        return $mini;
+
+  if (array_key_exists($pid, $cache)) {
+    return $cache[$pid];
+  }
+
+  if (!is_numeric($pid)) {
+    $where = "name = '%s'";
+  }
+  else {
+    $where = 'pid = %d';
+  }
+  $mini = db_fetch_object(db_query("SELECT * FROM {panels_mini} WHERE $where", $pid));
+  if (!$mini) {
+    $defaults = panels_mini_default_panels();
+    if (isset($defaults[$pid])) {
+      $mini = $defaults[$pid];
+      $status = variable_get('panel_mini_defaults', array());
+      // Determine if default panel is enabled or disabled.
+      if (isset($status[$mini->name])) {
+        $mini->disabled = $status[$mini->name];
       }
-      return;
+      $cache[$pid] = $mini;
+      return $mini;
     }
+    return;
+  }
 
-    $mini->contexts = (!empty($mini->contexts)) ? unserialize($mini->contexts) : array();
-    $mini->requiredcontexts = (!empty($mini->requiredcontexts)) ? unserialize($mini->requiredcontexts) : array();
-    $mini->relationships = (!empty($mini->relationships)) ? unserialize($mini->relationships) : array();
+  $mini->contexts = (!empty($mini->contexts)) ? unserialize($mini->contexts) : array();
+  $mini->requiredcontexts = (!empty($mini->requiredcontexts)) ? unserialize($mini->requiredcontexts) : array();
+  $mini->relationships = (!empty($mini->relationships)) ? unserialize($mini->relationships) : array();
 
-    $cache[$pid] = panels_mini_sanitize($mini);
+  $cache[$pid] = panels_mini_sanitize($mini);
+  $cache[$pid]->display = panels_load_display($cache[$pid]->did);
 
-    $cache[$pid]->display = panels_load_display($cache[$pid]->did);
-  }
   return $cache[$pid];
 }
 
Index: panels_page/panels_page.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/panels/panels_page/Attic/panels_page.module,v
retrieving revision 1.1.2.54
diff -u -p -r1.1.2.54 panels_page.module
--- panels_page/panels_page.module	3 Jun 2008 20:46:34 -0000	1.1.2.54
+++ panels_page/panels_page.module	4 Jun 2008 22:05:45 -0000
@@ -970,36 +970,40 @@ function panels_page_load_all($names = a
  */
 function panels_page_load($pid, $load_display = FALSE) {
   static $cache = array();
-  if (!array_key_exists($pid, $cache)) {
-    if (!is_numeric($pid)) {
-      $where = "name = '%s'";
-    }
-    else {
-      $where = 'pid = %d';
-    }
-    $page = db_fetch_object(db_query("SELECT * FROM {panels_page} WHERE $where", $pid));
-    if (!$page) {
-      $defaults = panels_page_default_panels();
-      if (isset($defaults[$pid])) {
-        $page = $cache[$pid] = $defaults[$pid];
-        return $page;
-      }
-      return;
+
+  if (array_key_exists($pid, $cache)) {
+    return $cache[$pid];
+  }
+
+  if (!is_numeric($pid)) {
+    $where = "name = '%s'";
+  }
+  else {
+    $where = 'pid = %d';
+  }
+  $page = db_fetch_object(db_query("SELECT * FROM {panels_page} WHERE $where", $pid));
+  if (!$page) {
+    $defaults = panels_page_default_panels();
+    if (isset($defaults[$pid])) {
+      $page = $cache[$pid] = $defaults[$pid];
+      return $page;
     }
+    return;
+  }
 
-    $page->access = ($page->access ? explode(', ', $page->access) : array());
-    $page->arguments = (!empty($page->arguments)) ? unserialize($page->arguments) : array();
-    $page->displays = (!empty($page->displays)) ? unserialize($page->displays) : array();
-    $page->contexts = (!empty($page->contexts)) ? unserialize($page->contexts) : array();
-    $page->relationships = (!empty($page->relationships)) ? unserialize($page->relationships) : array();
-    $page->switcher_options = (!empty($page->switcher_options)) ? unserialize($page->switcher_options) : array();
+  $page->access = ($page->access ? explode(', ', $page->access) : array());
+  $page->arguments = (!empty($page->arguments)) ? unserialize($page->arguments) : array();
+  $page->displays = (!empty($page->displays)) ? unserialize($page->displays) : array();
+  $page->contexts = (!empty($page->contexts)) ? unserialize($page->contexts) : array();
+  $page->relationships = (!empty($page->relationships)) ? unserialize($page->relationships) : array();
+  $page->switcher_options = (!empty($page->switcher_options)) ? unserialize($page->switcher_options) : array();
 
-    $cache[$pid] = panels_page_sanitize($page);
+  $cache[$pid] = panels_page_sanitize($page);
 
-    if ($load_display) {
-      $cache[$pid]->display = panels_load_display($cache[$pid]->did);
-    }
+  if ($load_display) {
+    $cache[$pid]->display = panels_load_display($cache[$pid]->did);
   }
+
   return $cache[$pid];
 }
 
Index: panels_views/panels_views.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/panels/panels_views/Attic/panels_views.module,v
retrieving revision 1.1.2.23
diff -u -p -r1.1.2.23 panels_views.module
--- panels_views/panels_views.module	3 Jun 2008 18:46:04 -0000	1.1.2.23
+++ panels_views/panels_views.module	4 Jun 2008 22:06:08 -0000
@@ -1311,32 +1311,34 @@ function panels_views_save($pv) {
 function panels_views_load($name) {
   static $panel_views = array();
 
-  if (!array_key_exists($name, $panel_views)) {
-    $pv = db_fetch_object(db_query("SELECT * FROM {panels_views} WHERE name = '%s'", $name));
-    if (empty($pv)) {
-      $defaults = panels_views_default_panels();
-      if (isset($defaults[$name])) {
-        $pv = $defaults[$name];
-        $status = variable_get('panels_views_defaults', array());
-        // Determine if default panel is enabled or disabled.
-        if (isset($status[$pv->name])) {
-          $pv->disabled = $status[$pv->name];
-        }
-        $panel_views[$name] = $pv;
-        return $pv;
+  if (array_key_exists($name, $panel_views)) {
+    return $panel_views[$name];
+  }
+  $pv = db_fetch_object(db_query("SELECT * FROM {panels_views} WHERE name = '%s'", $name));
+  if (empty($pv)) {
+    $defaults = panels_views_default_panels();
+    if (isset($defaults[$name])) {
+      $pv = $defaults[$name];
+      $status = variable_get('panels_views_defaults', array());
+      // Determine if default panel is enabled or disabled.
+      if (isset($status[$pv->name])) {
+        $pv->disabled = $status[$pv->name];
       }
-      $panel_views[$name] = NULL;
-      return;
+      $panel_views[$name] = $pv;
+      return $pv;
     }
+    $panel_views[$name] = NULL;
+    return;
+  }
 
-    $names = panels_views_pane_fields();
-    foreach ($names as $key => $data) {
-      if (!empty($data['serialize'])) {
-        $pv->$key = unserialize($pv->$key);
-      }
+  $names = panels_views_pane_fields();
+  foreach ($names as $key => $data) {
+    if (!empty($data['serialize'])) {
+      $pv->$key = unserialize($pv->$key);
     }
-    $panel_views[$name] = $pv;
   }
+  $panel_views[$name] = $pv;
+
   return $panel_views[$name];
 }
 
@@ -1346,37 +1348,38 @@ function panels_views_load($name) {
 function panels_views_load_all() {
   static $panel_views = NULL;
 
-  if (!isset($panel_views)) {
-    $panel_views = array();
-    $names       = panels_views_pane_fields();
-    $result      = db_query("SELECT * FROM {panels_views}");
-
-    while ($pv = db_fetch_object($result)) {
-      foreach ($names as $name => $data) {
-        if (!empty($data['serialize'])) {
-          $pv->$name = unserialize($pv->$name);
-        }
+  if (isset($panel_views)) {
+    return $panel_views;
+  }
+  $panel_views = array();
+  $names       = panels_views_pane_fields();
+  $result      = db_query("SELECT * FROM {panels_views}");
+
+  while ($pv = db_fetch_object($result)) {
+    foreach ($names as $name => $data) {
+      if (!empty($data['serialize'])) {
+        $pv->$name = unserialize($pv->$name);
       }
-      $pv->type = t('Local');
-      $panel_views[$pv->name] = $pv;
     }
+    $pv->type = t('Local');
+    $panel_views[$pv->name] = $pv;
+  }
 
-    // Now load all the in-code versions
-    $status = variable_get('panels_views_defaults', array());
+  // Now load all the in-code versions
+  $status = variable_get('panels_views_defaults', array());
 
-    foreach (panels_views_default_panels() as $pv) {
-      // Determine if default panel is enabled or disabled.
-      if (isset($status[$pv->name])) {
-        $pv->disabled = $status[$pv->name];
-      }
+  foreach (panels_views_default_panels() as $pv) {
+    // Determine if default panel is enabled or disabled.
+    if (isset($status[$pv->name])) {
+      $pv->disabled = $status[$pv->name];
+    }
 
-      if (!empty($panel_views[$pv->name])) {
-        $panel_views[$pv->name]->type = t('Overridden');
-      }
-      else {
-        $pv->type = t('Default');
-        $panel_views[$pv->name] = $pv;
-      }
+    if (!empty($panel_views[$pv->name])) {
+      $panel_views[$pv->name]->type = t('Overridden');
+    }
+    else {
+      $pv->type = t('Default');
+      $panel_views[$pv->name] = $pv;
     }
   }
   return $panel_views;