diff options
| author | Dries Buytaert <dries@buytaert.net> | 2007-04-15 15:36:10 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2007-04-15 15:36:10 +0000 |
| commit | f4cbd7c63d0b3cc221b079ecff99a4693de3dabd (patch) | |
| tree | fb42f0450a1fc221480e1600de4866133045946d /includes | |
| parent | 125dbb1ab29c95962abdd5e405cd103a0f617ff0 (diff) | |
| download | brdo-f4cbd7c63d0b3cc221b079ecff99a4693de3dabd.tar.gz brdo-f4cbd7c63d0b3cc221b079ecff99a4693de3dabd.tar.bz2 | |
- Patch #118660 by agentrickard: re-order arguments of cache_set() to match PHP/Drupal conventions.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/bootstrap.inc | 2 | ||||
| -rw-r--r-- | includes/cache.inc | 6 | ||||
| -rw-r--r-- | includes/common.inc | 2 | ||||
| -rw-r--r-- | includes/theme.inc | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index 4046cbd7b..1a5fca334 100644 --- a/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -372,7 +372,7 @@ function variable_init($conf = array()) { while ($variable = db_fetch_object($result)) { $variables[$variable->name] = unserialize($variable->value); } - cache_set('variables', 'cache', serialize($variables)); + cache_set('variables', serialize($variables)); } foreach ($conf as $name => $value) { diff --git a/includes/cache.inc b/includes/cache.inc index 371d01bdb..2f656541d 100644 --- a/includes/cache.inc +++ b/includes/cache.inc @@ -74,11 +74,11 @@ function cache_get($key, $table = 'cache') { * * @param $cid * The cache ID of the data to store. + * @param $data + * The data to store in the cache. Complex data types must be serialized first. * @param $table * The table $table to store the data in. Valid core values are 'cache_filter', * 'cache_menu', 'cache_page', or 'cache'. - * @param $data - * The data to store in the cache. Complex data types must be serialized first. * @param $expire * One of the following values: * - CACHE_PERMANENT: Indicates that the item should never be removed unless @@ -90,7 +90,7 @@ function cache_get($key, $table = 'cache') { * @param $headers * A string containing HTTP header information for cached pages. */ -function cache_set($cid, $table = 'cache', $data, $expire = CACHE_PERMANENT, $headers = NULL) { +function cache_set($cid, $data, $table = 'cache', $expire = CACHE_PERMANENT, $headers = NULL) { db_lock_table($table); db_query("UPDATE {%s} SET data = %b, created = %d, expire = %d, headers = '%s' WHERE cid = '%s'", $table, $data, time(), $expire, $headers, $cid); if (!db_affected_rows()) { diff --git a/includes/common.inc b/includes/common.inc index 1ab8a0195..ebbb75c14 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -1926,7 +1926,7 @@ function page_set_cache() { } ob_end_flush(); if ($cache && $data) { - cache_set($base_root . request_uri(), 'cache_page', $data, CACHE_TEMPORARY, drupal_get_headers()); + cache_set($base_root . request_uri(), $data, 'cache_page', CACHE_TEMPORARY, drupal_get_headers()); } } } diff --git a/includes/theme.inc b/includes/theme.inc index 4d02c0ecc..8db547614 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -128,7 +128,7 @@ function _theme_load_registry($theme, $theme_engine = NULL) { * Write the theme_registry cache into the database. */ function _theme_save_registry($theme, $registry) { - cache_set("theme_registry:$theme", 'cache', serialize($registry)); + cache_set("theme_registry:$theme", serialize($registry)); } /** |