Merge pull request #12796 from jeabakker/misc-fixes

Misc fixes
Elgg · Aug 28, 2019 · 719b7b0 · 719b7b0
2 parents 912fb8f + c8a4106
commit 719b7b0
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 18 deletions.
diff --git a/engine/classes/Elgg/Cache/SimpleCache.php b/engine/classes/Elgg/Cache/SimpleCache.php
@@ -149,7 +149,7 @@ private function getPath() {
 	 * @return bool
 	 */
 	public function invalidate() {
-		elgg_delete_directory($this->getPath());
+		elgg_delete_directory($this->getPath(), true);
 
 		$time = time();
 		$this->config->save("simplecache_lastupdate", $time);

diff --git a/engine/lib/filestore.php b/engine/lib/filestore.php
@@ -70,13 +70,14 @@ function elgg_save_resized_image($source, $destination = null, array $params = [
 /**
  * Delete a directory and all its contents
  *
- * @param string $directory Directory to delete
+ * @param string $directory            Directory to delete
+ * @param bool   $leave_base_directory Leave the base directory intact (default: false)
  *
  * @return bool
  *
  * @since 3.1
  */
-function elgg_delete_directory(string $directory) {
+function elgg_delete_directory(string $directory, bool $leave_base_directory = false) {
 
 	if (!file_exists($directory)) {
 		return true;
@@ -109,8 +110,14 @@ function elgg_delete_directory(string $directory) {
 		}
 	}
 
-	// remove empty directory
+	// close file handler
 	closedir($handle);
+
+	if ($leave_base_directory) {
+		return true;
+	}
+
+	// remove empty directory
 	return rmdir($directory);
 }
 

diff --git a/engine/tests/phpunit/unit/Elgg/Cache/SimpleCacheUnitTest.php b/engine/tests/phpunit/unit/Elgg/Cache/SimpleCacheUnitTest.php
@@ -61,5 +61,31 @@ public function testCanEnableSimplecache() {
 		_elgg_config()->save('simplecache_enabled', $is_enabled);
 
 	}
+
+	public function testInvalidateSimplecacheSymlinked() {
+
+		if (stripos(PHP_OS, 'WIN') !== false) {
+			$this->markTestSkipped('Unable to test symlinks on Windows');
+		}
+
+		$is_enabled = _elgg_config()->simplecache_enabled;
+		_elgg_config()->save('simplecache_enabled', true);
+
+		$this->assertTrue(_elgg_services()->simpleCache->isEnabled());
+
+		// create symlink
+		$this->assertTrue(_elgg_symlink_cache());
+
+		// invalidate cache
+		_elgg_services()->simpleCache->invalidate();
+
+		// ensure symlink still works
+		$this->assertTrue(_elgg_is_cache_symlinked());
+
+		_elgg_config()->save('simplecache_enabled', $is_enabled);
+
+		// cleanup symlink
+		$this->assertTrue(unlink(elgg_get_root_path() . 'cache'));
+	}
 
 }
diff --git a/mod/discussions/views/default/resources/discussion/add.php b/mod/discussions/views/default/resources/discussion/add.php
@@ -19,10 +19,9 @@
 $body_vars = discussion_prepare_form_vars();
 $content = elgg_view_form('discussion/save', [], $body_vars);
 
-$params = [
-	'content' => $content,
+$body = elgg_view_layout('default', [
 	'title' => $title,
-];
-$body = elgg_view_layout('default', $params);
+	'content' => $content,
+]);
 
 echo elgg_view_page($title, $body);
diff --git a/mod/discussions/views/default/resources/discussion/all.php b/mod/discussions/views/default/resources/discussion/all.php
@@ -6,8 +6,8 @@
 $content = elgg_view('discussion/listing/all');
 
 $body = elgg_view_layout('default', [
-	'content' => $content,
 	'title' => $title,
+	'content' => $content,
 ]);
 
 echo elgg_view_page($title, $body);
diff --git a/mod/discussions/views/default/resources/discussion/edit.php b/mod/discussions/views/default/resources/discussion/edit.php
@@ -14,10 +14,9 @@
 $body_vars = discussion_prepare_form_vars($topic);
 $content = elgg_view_form('discussion/save', [], $body_vars);
 
-$params = [
-	'content' => $content,
+$body = elgg_view_layout('default', [
 	'title' => $title,
-];
-$body = elgg_view_layout('default', $params);
+	'content' => $content,
+]);
 
 echo elgg_view_page($title, $body);
diff --git a/mod/discussions/views/default/resources/discussion/group.php b/mod/discussions/views/default/resources/discussion/group.php
@@ -20,8 +20,8 @@
 ]);
 
 $body = elgg_view_layout('default', [
-	'content' => $content,
 	'title' => $title,
+	'content' => $content,
 ]);
 
 echo elgg_view_page($title, $body);
diff --git a/mod/discussions/views/default/resources/discussion/owner.php b/mod/discussions/views/default/resources/discussion/owner.php
@@ -34,9 +34,9 @@
 	'entity' => $target,
 ]);
 
-$body = elgg_view_layout('content', [
-	'content' => $content,
+$body = elgg_view_layout('default', [
 	'title' => $title,
+	'content' => $content,
 ]);
 
 echo elgg_view_page($title, $body);
diff --git a/mod/discussions/views/default/resources/discussion/view.php b/mod/discussions/views/default/resources/discussion/view.php
@@ -15,10 +15,11 @@
 
 $title = $topic->getDisplayName();
 
-$body = elgg_view_layout('content', [
-	'content' => $content,
+$body = elgg_view_layout('default', [
 	'title' => $title,
+	'content' => $content,
 	'entity' => $topic,
+	'filter_id' => 'discussion/view',
 ]);
 
 echo elgg_view_page($title, $body);