Merge pull request #139 from iMattPro/develop

Final tweaks

Author: iMattPro

CHANGELOG.md

@@ -1,13 +1,13 @@
 # QuickInstall Changelog
 
 ## Version 1.4.0
-- [Change] Re-styled some of QI's UX elements including sidebar menus, buttons and various other form elements.
+- [Change] Re-styled some of QI's UI elements including sidebar menus, buttons and various other form elements.
 - [Change] Migrated QI's Bootstrap framework to version 4.5.
 - [Change] Bootstrap framework now managed as an NPM library, located in the new `develop` folder. Contributors can use NPM commands to update, customise, compile and deploy Bootstrap to QI (see README).
-- [Change] Migrated QI's templating framework over to Twig. All QI html files now use Twig syntax. Contributors can use Composer commands to update Twig, located in the `vendor` directory.
-- [Change] Dropped support for installing AutoMOD from QuickInstall.
-- [Change] Dropped the subsilver2 only option from the Install additional styles setting.
-- [Feature] Added a `DEBUG` constant to `qi_constants.php`. Contributors can un-comment it while developing QI to disable template caching.
+- [Change] Migrated QI's templating framework to Twig. All QI html files now use Twig syntax. Contributors can use Composer commands to update Twig, located in the `vendor` directory.
+- [Change] Dropped support for installing AutoMOD into 3.0.x boards from QuickInstall. AutoMOD can still be installed manually for 3.0.x boards.
+- [Change] Dropped the *subsilver2 only* option from the Install additional styles setting.
+- [Change] Added a `DEBUG` constant to `qi_constants.php`. Contributors can un-comment it while developing QI to disable template caching.
 - [Fix] Fixed an issue with the migration schema generator that blocked QI from working with phpBB 4.0.0-dev.
 - [Fix] Fixed some issues with language vars not working on error pages.
 

includes/functions_populate.php

@@ -193,10 +193,6 @@ public function populate()
 			// Give posts a timestamp starting 1 second after the last user reg date
 			$this->post_time = $this->start_time + $this->num_users + 1;
 
-			include($quickinstall_path . 'includes/lorem_ipsum.' . $phpEx);
-			$this->lorem_ipsum = $lorem_ipsum;
-			unset($lorem_impsum);
-
 			$this->fill_forums();
 		}
 
@@ -369,7 +365,7 @@ private function fill_forums()
 					$poster_id	= mt_rand($mt_min, $mt_max);
 					$poster_arr	= $this->user_arr[$poster_id];
 					$post_time	= $this->post_time++;
-					$post_text	= sprintf($user->lang['TEST_POST_START'], $post_cnt) . "\n" . $this->lorem_ipsum;
+					$post_text	= sprintf($user->lang['TEST_POST_START'], $post_cnt) . "\n" . $user->lang['LOREM_IPSUM'];
 					$subject	= (($j > 0) ? 'Re: ' : '') . $topic_arr['topic_title'];
 
 					$bbcode_uid = $bbcode_bitfield = '';

includes/lorem_ipsum.php

@@ -162,6 +162,7 @@
 	'REQUIRED'				=> 'Required',
 
 	'LOG_INSTALL_INSTALLED_QI'	=> '<strong>Installed by phpBB Quickinstall version %s</strong>',
+	'LOREM_IPSUM'			=> 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.',
 
 	'MAKE_WRITABLE'			=> 'Make files world writable',
 	'MAKE_WRITABLE_EXPLAIN'	=> 'Set files, &quot;config.php&quot;, and directories world writable by default.',