Upgraded to Elgg 1.8.4.

4 files changed, 198 insertions, 1 deletions

diff --git a/engine/tests/api/helpers.php b/engine/tests/api/helpers.php
index 77205138d..62e4471e0 100644
--- a/engine/tests/api/helpers.php
+++ b/engine/tests/api/helpers.php
@@ -518,4 +518,87 @@ class ElggCoreHelpersTest extends ElggCoreUnitTest {
 
 		$this->assertIdentical($elements_sorted_string, $test_elements);
 	}
+
+	// see http://trac.elgg.org/ticket/4288
+	public function testElggBatchIncOffset() {
+		// normal increment
+		$options = array(
+			'offset' => 0,
+			'limit' => 11
+		);
+		$batch = new ElggBatch(array('ElggCoreHelpersTest', 'elgg_batch_callback_test'), $options,
+				null, 5);
+		$j = 0;
+		foreach ($batch as $e) {
+			$offset = floor($j / 5) * 5;
+			$this->assertEqual($offset, $e['offset']);
+			$this->assertEqual($j + 1, $e['index']);
+			$j++;
+		}
+
+		$this->assertEqual(11, $j);
+
+		// no increment, 0 start
+		ElggCoreHelpersTest::elgg_batch_callback_test(array(), true);
+		$options = array(
+			'offset' => 0,
+			'limit' => 11
+		);
+		$batch = new ElggBatch(array('ElggCoreHelpersTest', 'elgg_batch_callback_test'), $options,
+				null, 5);
+		$batch->setIncrementOffset(false);
+
+		$j = 0;
+		foreach ($batch as $e) {
+			$this->assertEqual(0, $e['offset']);
+			// should always be the same 5
+			$this->assertEqual($e['index'], $j + 1 - (floor($j / 5) * 5));
+			$j++;
+		}
+		$this->assertEqual(11, $j);
+
+		// no increment, 3 start
+		ElggCoreHelpersTest::elgg_batch_callback_test(array(), true);
+		$options = array(
+			'offset' => 3,
+			'limit' => 11
+		);
+		$batch = new ElggBatch(array('ElggCoreHelpersTest', 'elgg_batch_callback_test'), $options,
+				null, 5);
+		$batch->setIncrementOffset(false);
+
+		$j = 0;
+		foreach ($batch as $e) {
+			$this->assertEqual(3, $e['offset']);
+			// same 5 results
+			$this->assertEqual($e['index'], $j + 4 - (floor($j / 5) * 5));
+			$j++;
+		}
+
+		$this->assertEqual(11, $j);
+	}
+
+	static function elgg_batch_callback_test($options, $reset = false) {
+		static $count = 1;
+
+		if ($reset) {
+			$count = 1;
+			return true;
+		}
+
+		if ($count > 20) {
+			return false;
+		}
+
+		for ($j = 0; ($options['limit'] < 5) ? $j < $options['limit'] : $j < 5; $j++) {
+			$return[] = array(
+				'offset' => $options['offset'],
+				'limit' => $options['limit'],
+				'count' => $count++,
+				'index' => 1 + $options['offset'] + $j
+			);
+		}
+
+		return $return;
+	}
 }
\ No newline at end of file
diff --git a/engine/tests/api/metastrings.php b/engine/tests/api/metastrings.php
index a96388217..0a8945084 100644
--- a/engine/tests/api/metastrings.php
+++ b/engine/tests/api/metastrings.php
@@ -132,7 +132,7 @@ class ElggCoreMetastringsTest extends ElggCoreUnitTest {
 	public function testKeepMeFromDeletingEverything() {
 		foreach ($this->metastringTypes as $type) {
 			$required = array(
-				'guid', 'guids', 'limit'
+				'guid', 'guids'
 			);
 
 			switch ($type) {
@@ -160,6 +160,10 @@ class ElggCoreMetastringsTest extends ElggCoreUnitTest {
 			$options = array();
 			$this->assertFalse(elgg_is_valid_options_for_batch_operation($options, $type));
 
+			// limit alone isn't valid:
+			$options = array('limit' => 10);
+			$this->assertFalse(elgg_is_valid_options_for_batch_operation($options, $type));
+
 			foreach ($required as $key) {
 				$options = array();
 
diff --git a/engine/tests/objects/objects.php b/engine/tests/objects/objects.php
index 0d0df6b75..915594e0a 100644
--- a/engine/tests/objects/objects.php
+++ b/engine/tests/objects/objects.php
@@ -194,7 +194,99 @@ class ElggCoreObjectTest extends ElggCoreUnitTest {
 		$old = elgg_set_ignore_access(true);
 	}
 
+	// see http://trac.elgg.org/ticket/1196
+	public function testElggEntityRecursiveDisableWhenLoggedOut() {
+		$e1 = new ElggObject();
+		$e1->access_id = ACCESS_PUBLIC;
+		$e1->owner_guid = 0;
+		$e1->container_guid = 0;
+		$e1->save();
+		$guid1 = $e1->getGUID();
+
+		$e2 = new ElggObject();
+		$e2->container_guid = $guid1;
+		$e2->access_id = ACCESS_PUBLIC;
+		$e2->owner_guid = 0;
+		$e2->save();
+		$guid2 = $e2->getGUID();
+
+		// fake being logged out
+		$user = $_SESSION['user'];
+		unset($_SESSION['user']);
+		$ia = elgg_set_ignore_access(true);
+
+		$this->assertTrue(disable_entity($guid1, null, true));
+
+		// "log in" original user
+		$_SESSION['user'] = $user;
+		elgg_set_ignore_access($ia);
+
+		$this->assertFalse(get_entity($guid1));
+		$this->assertFalse(get_entity($guid2));
+
+		$db_prefix = get_config('dbprefix');
+		$q = "SELECT * FROM {$db_prefix}entities WHERE guid = $guid1";
+		$r = get_data_row($q);
+		$this->assertEqual('no', $r->enabled);
+
+		$q = "SELECT * FROM {$db_prefix}entities WHERE guid = $guid2";
+		$r = get_data_row($q);
+		$this->assertEqual('no', $r->enabled);
+
+		access_show_hidden_entities(true);
+		delete_entity($guid1);
+		delete_entity($guid2);
+		access_show_hidden_entities(false);
+	}
+
+	public function testElggRecursiveDelete() {
+		$types = array('ElggGroup', 'ElggObject', 'ElggUser', 'ElggSite');
+		$db_prefix = elgg_get_config('dbprefix');
+
+		foreach ($types as $type) {
+			$parent = new $type();
+			$this->assertTrue($parent->save());
+			
+			$child = new ElggObject();
+			$child->container_guid = $parent->guid;
+			$this->assertTrue($child->save());
+
+			$grandchild = new ElggObject();
+			$grandchild->container_guid = $child->guid;
+			$this->assertTrue($grandchild->save());
+
+			$this->assertTrue($parent->delete(true));
+
+			$q = "SELECT * FROM {$db_prefix}entities WHERE guid = $parent->guid";
+			$r = get_data($q);
+			$this->assertFalse($r);
+
+			$q = "SELECT * FROM {$db_prefix}entities WHERE guid = $child->guid";
+			$r = get_data($q);
+			$this->assertFalse($r);
 
+			$q = "SELECT * FROM {$db_prefix}entities WHERE guid = $grandchild->guid";
+			$r = get_data($q);
+			$this->assertFalse($r);
+		}
+
+		// object that owns itself
+		// can't check container_guid because of infinite loops in can_edit_entity()
+		$obj = new ElggObject();
+		$obj->save();
+		$obj->owner_guid = $obj->guid;
+		$obj->save();
+
+		$q = "SELECT * FROM {$db_prefix}entities WHERE guid = $obj->guid";
+		$r = get_data_row($q);
+		$this->assertEqual($obj->guid, $r->owner_guid);
+
+		$this->assertTrue($obj->delete(true));
+
+		$q = "SELECT * FROM {$db_prefix}entities WHERE guid = $obj->guid";
+		$r = get_data_row($q);
+		$this->assertFalse($r);
+	}
 
 	protected function get_object_row($guid) {
 		global $CONFIG;
diff --git a/engine/tests/regression/trac_bugs.php b/engine/tests/regression/trac_bugs.php
index 99cf81774..26a45ab6a 100644
--- a/engine/tests/regression/trac_bugs.php
+++ b/engine/tests/regression/trac_bugs.php
@@ -199,4 +199,22 @@ class ElggCoreRegressionBugsTest extends ElggCoreUnitTest {
 		$this->assertFalse($result);
 		$this->assertEqual(array(), $DB_DELAYED_QUERIES);
 	}
+
+	/**
+	 * http://trac.elgg.org/ticket/3210 - Don't remove -s in friendly titles
+	 * @todo: http://trac.elgg.org/ticket/2276 - improve char encoding
+	 */
+	public function test_friendly_title() {
+		$cases = array(
+			'Simple Test' => 'simple-test',
+			'Test top-level page' => 'test-top-level-page',
+//			'éclair' => 'éclair',
+//			'English, Español, and 日本語' => 'english-español-and-日本語'
+		);
+
+		foreach ($cases as $case => $expected) {
+			$friendly_title = elgg_get_friendly_title($case);
+			$this->assertIdentical($expected, $friendly_title);
+		}
+	}
 }