Merge branch 'master' of http://itlab.mmcs.sfedu.ru/git/grade-rating

~dev_rating/application/classes/Controller/Teacher/Map.php

@@ -202,7 +202,8 @@ class Controller_Teacher_Map extends Controller_UserEnvi {
 	
     private function GetSubjectsList($db)
     {
-        $list = $db->GetSubjectList();
+		$NameFilter = '';
+        $list = $db->GetSubjectList($NameFilter);
 		
 		$SubjectsList = array(); $i = 0;
 		

~dev_rating/application/classes/Model/Teacher/Map.php

@@ -110,9 +110,9 @@ class Model_Teacher_Map extends Model
         return DB::query(Database::SELECT, $sql)->execute();
     }
 	
-    public function GetSubjectList()
+    public function GetSubjectList($NameFilter)
     {
-        $sql = "CALL `GetSubjects`(); ";
+        $sql = "CALL `GetSubjects`('$NameFilter'); ";
         return DB::query(Database::SELECT, $sql)->execute();
     }