From a866c39ec3cd69301ea2197c1048bc65b63502db Mon Sep 17 00:00:00 2001
From: Sam Georges <sam@daftspunk.com>
Date: Tue, 17 Jun 2014 19:14:44 +1000
Subject: [PATCH] Fixes #316 manually (unable to merge)

---
 modules/system/classes/PluginManager.php | 1 +
 tests/unit/cms/classes/ThemeTest.php     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/modules/system/classes/PluginManager.php b/modules/system/classes/PluginManager.php
index 03ba946a6..147c19ed9 100644
--- a/modules/system/classes/PluginManager.php
+++ b/modules/system/classes/PluginManager.php
@@ -299,6 +299,7 @@ class PluginManager
         $dirPath = $this->getPath();
         $it = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($dirPath));
         $it->setMaxDepth(2);
+        $it->rewind();
 
         while($it->valid()) {
             if (($it->getDepth() > 1) && $it->isFile() && (strtolower($it->getFilename()) == "plugin.php")) {
diff --git a/tests/unit/cms/classes/ThemeTest.php b/tests/unit/cms/classes/ThemeTest.php
index d1e585cf9..436f033ae 100644
--- a/tests/unit/cms/classes/ThemeTest.php
+++ b/tests/unit/cms/classes/ThemeTest.php
@@ -15,6 +15,7 @@ class ThemeTest extends TestCase
         $result = 0;
         $it = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path));
         $it->setMaxDepth(1);
+        $it->rewind();
 
         while($it->valid()) {
             if (!$it->isDot() && !$it->isDir() && $it->getExtension() == 'htm')