.htaccess.default

@@ -212,15 +212,15 @@ FileETag None
   ##
   # Uncomment the following lines to add "www." to the domain:
   #
-  #   RewriteCond %{HTTP_HOST} ^domain\.com$ [NC]
-  #   RewriteRule (.*) http://www.domain.com/$1 [R=301,L]
+  #   RewriteCond %{HTTP_HOST} ^example\.com$ [NC]
+  #   RewriteRule (.*) http://www.example.com/$1 [R=301,L]
   #
   # Uncomment the following lines to remove "www." from the domain:
   #
-  #   RewriteCond %{HTTP_HOST} ^www\.domain\.com$ [NC]
-  #   RewriteRule (.*) http://domain.com/$1 [R=301,L]
+  #   RewriteCond %{HTTP_HOST} ^www\.example\.com$ [NC]
+  #   RewriteRule (.*) http://example.com/$1 [R=301,L]
   #
-  # Make sure to replace "domain.com" with your domain name.
+  # Make sure to replace "example.com" with your domain name.
   ##
 
   ##

README.md

@@ -42,9 +42,9 @@ How to access the back end
 Open your web browser and add `/contao` to the URL of your website. Here are a
 few examples:
 
- * `http://www.yourdomain.com/contao`
- * `http://www.yourdomain.com/contao/contao`
- * `http://www.yourdomain.com/contao-3.1.0/contao`
+ * `http://www.example.com/contao`
+ * `http://www.example.com/contao/contao`
+ * `http://www.example.com/contao-3.1.0/contao`
 
 
 Troubleshooting

assets/contao/css/debug-uncompressed.css

@@ -12,6 +12,9 @@
 	color:#444;
 	line-height:1;
 }
+#debug > * {
+	z-index:998; /* see #6205 */
+}
 #debug p {
 	margin:0;
 	padding:12px 10px;

contao/install.php

@@ -733,9 +733,12 @@ protected function createAdminUser()
 
 					$this->Config->update("\$GLOBALS['TL_CONFIG']['adminEmail']", Input::post('email', true));
 
-					// Scan the upload folder
-					$this->import('Database\\Updater', 'Updater');
-					$this->Updater->scanUploadFolder();
+					// Scan the upload folder (see #6134)
+					if ($this->Database->tableExists('tl_files') && $this->Database->query("SELECT COUNT(*) AS count FROM tl_files")->count < 1)
+					{
+						$this->import('Database\\Updater', 'Updater');
+						$this->Updater->scanUploadFolder();
+					}
 
 					$this->reload();
 				}

contao/main.php

@@ -240,7 +240,10 @@ protected function output()
 		$this->Template->isPopup = Input::get('popup');
 
 		// Hide the cache message in the repository manager (see #5966)
-		$this->Template->needsCacheBuild = (!$GLOBALS['TL_CONFIG']['bypassCache'] && (Input::get('do') != 'repository_manager' || !isset($_GET['install']) && !isset($_GET['uninstall']) && !isset($_GET['update'])) && !is_dir(TL_ROOT . '/system/cache/dca'));
+		if (!$GLOBALS['TL_CONFIG']['bypassCache'] && $this->User->isAdmin)
+		{
+			$this->Template->needsCacheBuild = ((Input::get('do') != 'repository_manager' || !isset($_GET['install']) && !isset($_GET['uninstall']) && !isset($_GET['update'])) && !is_dir(TL_ROOT . '/system/cache/dca'));
+		}
 
 		// Front end preview links
 		if (defined('CURRENT_ID') && CURRENT_ID != '')

index.php

@@ -221,25 +221,31 @@ public function run()
 		// Load the page object depending on its type
 		$objHandler = new $GLOBALS['TL_PTY'][$objPage->type]();
 
-		switch ($objPage->type)
+		try
 		{
-			case 'root':
-			case 'error_404':
-				$objHandler->generate($pageId);
-				break;
-
-			case 'error_403':
-				$objHandler->generate($pageId, $objRootPage);
-				break;
-
-			default:
-				$objHandler->generate($objPage, true);
-				break;
+			// Generate the page
+			switch ($objPage->type)
+			{
+				case 'root':
+				case 'error_404':
+					$objHandler->generate($pageId);
+					break;
+
+				case 'error_403':
+					$objHandler->generate($pageId, $objRootPage);
+					break;
+
+				default:
+					$objHandler->generate($objPage, true);
+					break;
+			}
+		}
+		catch (UnusedArgumentsException $e)
+		{
+			// Render the error page (see #5570)
+			$objHandler = new $GLOBALS['TL_PTY']['error_404']();
+			$objHandler->generate($pageId);
 		}
-
-		// If we get here, something went wrong (see #4277)
-		$objHandler = new $GLOBALS['TL_PTY']['error_404']();
-		$objHandler->generate($pageId);
 
 		// Stop the script (see #4565)
 		exit;

system/config/constants.php

@@ -15,7 +15,7 @@
  * Core version
  */
 define('VERSION', '3.1');
-define('BUILD', '2');
+define('BUILD', '3');
 define('LONG_TERM_SUPPORT', false);
 
 

system/config/default.php

@@ -152,7 +152,7 @@
  *
  * Here you can enable FTP for managing files and folders ("Safe Mode Hack").
  *
- *   ftpHost = host name (e.g. domain.com or domain.com:21)
+ *   ftpHost = host name (e.g. example.com or example.com:21)
  *   ftpPath = path to installation (e.g. html/)
  *   ftpUser = FTP username
  *   ftpPass = FTP password