disallow creating and renaming of folders that already exist

1 files changed, 11 insertions, 1 deletions

diff --git a/db/foldermapper.php b/db/foldermapper.php
index 9cfa905cb..041b3ada4 100644
--- a/db/foldermapper.php
+++ b/db/foldermapper.php
@@ -63,9 +63,19 @@ class FolderMapper extends NewsMapper {
 
 	public function findAllFromUser($userId){
 		$sql = 'SELECT * FROM `*dbprefix*news_folders` ' .
-			'AND `user_id` = ?';
+			'WHERE `user_id` = ?';
 		$params = array($userId);
 
 		return $this->findAllRows($sql, $params);
 	}
+
+
+	public function findByName($folderName, $userId){
+		$sql = 'SELECT * FROM `*dbprefix*news_folders` ' .
+			'WHERE `name` = ?' .
+			'AND `user_id` = ?';
+		$params = array($folderName, $userId);
+
+		return $this->findAllRows($sql, $params);
+	}
 }
\ No newline at end of file