Commit 23e652a6 authored by robertDouglass's avatar robertDouglass
Browse files

clean up the patch

parent b24f7780
Index: includes/bootstrap.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/bootstrap.inc,v
retrieving revision 1.145.2.3
diff -u -F^f -r1.145.2.3 bootstrap.inc
--- includes/bootstrap.inc 7 May 2007 04:19:54 -0000 1.145.2.3
+++ includes/bootstrap.inc 10 May 2007 17:45:54 -0000
retrieving revision 1.145
diff -u -F^f -r1.145 bootstrap.inc
--- includes/bootstrap.inc 15 Jan 2007 11:52:02 -0000 1.145
+++ includes/bootstrap.inc 27 Jun 2007 07:25:26 -0000
@@ -339,14 +339,14 @@ function drupal_get_filename($type, $nam
function variable_init($conf = array()) {
// NOTE: caching the variables improves performance by 20% when serving cached pages.
......@@ -22,23 +22,13 @@ diff -u -F^f -r1.145.2.3 bootstrap.inc
}
foreach ($conf as $name => $value) {
@@ -849,7 +849,8 @@ function _drupal_bootstrap($phase) {
* Drupal's bootstrap process.
*/
function _drupal_cache_init($phase) {
- require_once variable_get('cache_inc', './includes/cache.inc');
+ $cache_inc = variable_get('cache_inc', './includes/cache.inc');
+ require_once $cache_inc;
if ($phase == DRUPAL_BOOTSTRAP_EARLY_PAGE_CACHE && variable_get('page_cache_fastpath', 0)) {
if (page_cache_fastpath()) {
Index: includes/cache.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/cache.inc,v
retrieving revision 1.5.2.3
diff -u -F^f -r1.5.2.3 cache.inc
--- includes/cache.inc 22 Apr 2007 23:54:03 -0000 1.5.2.3
+++ includes/cache.inc 10 May 2007 17:45:54 -0000
retrieving revision 1.5
diff -u -F^f -r1.5 cache.inc
--- includes/cache.inc 10 Nov 2006 07:26:27 -0000 1.5
+++ includes/cache.inc 27 Jun 2007 07:25:26 -0000
@@ -21,12 +21,15 @@ function cache_get($key, $table = 'cache
variable_set('cache_flush', 0);
}
......@@ -106,7 +96,7 @@ RCS file: /cvs/drupal/drupal/includes/menu.inc,v
retrieving revision 1.146
diff -u -F^f -r1.146 menu.inc
--- includes/menu.inc 14 Jan 2007 01:37:48 -0000 1.146
+++ includes/menu.inc 10 May 2007 17:45:54 -0000
+++ includes/menu.inc 27 Jun 2007 07:25:26 -0000
@@ -208,12 +208,12 @@ function menu_get_menu() {
$cid = "$user->uid:$locale";
......@@ -128,7 +118,7 @@ RCS file: /cvs/drupal/drupal/modules/locale/locale.module,v
retrieving revision 1.155
diff -u -F^f -r1.155 locale.module
--- modules/locale/locale.module 27 Dec 2006 13:11:59 -0000 1.155
+++ modules/locale/locale.module 10 May 2007 17:45:54 -0000
+++ modules/locale/locale.module 27 Jun 2007 07:25:26 -0000
@@ -172,7 +172,7 @@ function locale($string) {
locale_refresh_cache();
$cache = cache_get("locale:$locale", 'cache');
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment