Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #355360 by burningdog, spatz4000, netaustin: standardize on 'cacheable'.

merge-requests/26/head
Dries Buytaert 2009-05-16 16:06:04 +00:00
parent 47413f6460
commit 856f667745
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
includes/cache.inc
View File

@ -66,7 +66,7 @@ function cache_get($cid, $table = 'cache') {
* users. This is the only table affected by the page cache setting on * users. This is the only table affected by the page cache setting on
* the administrator panel. * 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 * 'cache_filter': Stores filtered pieces of content. This table is
* periodically cleared of stale entries by cron. * 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 * - we try to put fast changing cache items and rather static
* ones into different tables. The effect is that only the fast * ones into different tables. The effect is that only the fast
* changing tables will need a lot of writes to disk. The more * 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 * @param $cid
* The cache ID of the data to store. * The cache ID of the data to store.

2
modules/filter/filter.install
View File

@ -81,7 +81,7 @@ function filter_schema() {
'not null' => TRUE, 'not null' => TRUE,
'default' => 0, 'default' => 0,
'size' => 'tiny', '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( 'weight' => array(
'type' => 'int', 'type' => 'int',

2
modules/search/search.module
View File

@ -509,7 +509,7 @@ function search_index($sid, $type, $text) {
if (preg_match('!(?:node|book)/(?:view/)?([0-9]+)!i', $path, $match)) { if (preg_match('!(?:node|book)/(?:view/)?([0-9]+)!i', $path, $match)) {
$linknid = $match[1]; $linknid = $match[1];
if ($linknid > 0) { 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)); $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)) { if (filter_format_allowcache($node->format)) {
$link = TRUE; $link = TRUE;