diff options
| author | Dries Buytaert <dries@buytaert.net> | 2009-05-16 16:06:04 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2009-05-16 16:06:04 +0000 |
| commit | 856f66774597f3acac5549203cac6441ef5f8fd5 (patch) | |
| tree | 7746e8e0cd9fceea4916771c128a582e9f617a45 | |
| parent | 47413f64604422556a32b4aa6594a659101413ff (diff) | |
| download | brdo-856f66774597f3acac5549203cac6441ef5f8fd5.tar.gz brdo-856f66774597f3acac5549203cac6441ef5f8fd5.tar.bz2 | |
- Patch #355360 by burningdog, spatz4000, netaustin: standardize on 'cacheable'.
| -rw-r--r-- | includes/cache.inc | 4 | ||||
| -rw-r--r-- | modules/filter/filter.install | 2 | ||||
| -rw-r--r-- | modules/search/search.module | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/includes/cache.inc b/includes/cache.inc index be98f31ef..c96f46058 100644 --- a/includes/cache.inc +++ b/includes/cache.inc @@ -66,7 +66,7 @@ function cache_get($cid, $table = 'cache') { * users. This is the only table affected by the page cache setting on * the administrator panel. * - * 'cache_menu': Stores the cachable part of the users' menus. + * 'cache_menu': Stores the cacheable part of the users' menus. * * 'cache_filter': Stores filtered pieces of content. This table is * periodically cleared of stale entries by cron. @@ -79,7 +79,7 @@ function cache_get($cid, $table = 'cache') { * - we try to put fast changing cache items and rather static * ones into different tables. The effect is that only the fast * changing tables will need a lot of writes to disk. The more - * static tables will also be better cachable with MySQL's query cache + * static tables will also be better cacheable with MySQL's query cache * * @param $cid * The cache ID of the data to store. diff --git a/modules/filter/filter.install b/modules/filter/filter.install index fb2a2ddeb..bff60eff6 100644 --- a/modules/filter/filter.install +++ b/modules/filter/filter.install @@ -81,7 +81,7 @@ function filter_schema() { 'not null' => TRUE, 'default' => 0, 'size' => 'tiny', - 'description' => 'Flag to indicate whether format is cachable. (1 = cachable, 0 = not cachable)', + 'description' => 'Flag to indicate whether format is cacheable. (1 = cacheable, 0 = not cacheable)', ), 'weight' => array( 'type' => 'int', diff --git a/modules/search/search.module b/modules/search/search.module index 8973c6cc9..d5360115e 100644 --- a/modules/search/search.module +++ b/modules/search/search.module @@ -509,7 +509,7 @@ function search_index($sid, $type, $text) { if (preg_match('!(?:node|book)/(?:view/)?([0-9]+)!i', $path, $match)) { $linknid = $match[1]; if ($linknid > 0) { - // Note: ignore links to uncachable nodes to avoid redirect bugs. + // Note: ignore links to uncacheable nodes to avoid redirect bugs. $node = db_fetch_object(db_query('SELECT n.title, n.nid, n.vid, r.format FROM {node} n INNER JOIN {node_revision} r ON n.vid = r.vid WHERE n.nid = %d', $linknid)); if (filter_format_allowcache($node->format)) { $link = TRUE; |