Fix JTable::addIncludePath - includes tests

libraries/joomla/table/table.php

@@ -228,7 +228,7 @@ public static function addIncludePath($path = null)
 		settype($path, 'array');
 
 		// If we have new paths to add, do so.
-		if (!empty($path) && !in_array($path, self::$_includePaths))
+		if (!empty($path))
 		{
 			// Check and add each individual new path.
 			foreach ($path as $dir)
@@ -237,7 +237,10 @@ public static function addIncludePath($path = null)
 				$dir = trim($dir);
 
 				// Add to the front of the list so that custom paths are searched first.
-				array_unshift(self::$_includePaths, $dir);
+				if (!in_array($dir, self::$_includePaths))
+				{
+					array_unshift(self::$_includePaths, $dir);
+				}
 			}
 		}
 

tests/suites/unit/joomla/table/JTableTest.php

@@ -92,6 +92,20 @@ public function testAddIncludePath()
 			$this->equalTo(realpath(JPATH_PLATFORM . '/joomla/table')),
 			'The default return from addIncludePath without additional parameters should be to "JPATH_PLATFORM . /joomla/table"'
 		);
+
+		// Test that adding paths that already exist don't get re-added
+		$expected = array(
+			'/dummy/',
+			'dir/not/exist',
+			JPATH_PLATFORM . '/joomla/table'
+		);
+
+		// Add dummy paths
+		$paths = JTable::addIncludePath(array('dir/not/exist', '/dummy/'));
+		// Re-add the returned paths - these shouldn't get added again.
+		$paths = JTable::addIncludePath($paths);
+
+		$this->assertEquals($expected, $paths);
 	}
 
 	/**