An upgrade from 3.2.1 to 3.3.1 seems to have gone wrong. Both the main site and the dashboard are inaccessible. At first I was getting the error message:
Fatal error: Call to undefined function wp_suspend_cache_addition() in /home/content/51/8151251/html/wp-includes/cache.php on line 288
I replaced wp-includes/functions.php with the version from a fresh download, because that was what Google suggested, but I also replaced wp-includes/category-template.php, which I probably shouldn't have. Now I'm getting another error message:
Fatal error: Cannot redeclare the_editor() (previously declared in /home/content/51/8151251/html/wp-includes/general-template.php:1789) in /home/content/51/8151251/html/wp-includes/deprecated.php on line 2635
This question covers the same problem, but there's no solution given.