minor bugfixes to getting survey permissions and deleting surveys.

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_ci@11136 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Oct 10, 2011 · 204e1f5 · 204e1f5
1 parent 995d980
commit 204e1f5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/application/controllers/admin/survey.php b/application/controllers/admin/survey.php
@@ -900,7 +900,7 @@ function delete()
 
             if (!(!isset($deleteok) || !$deleteok))
             {
-                _deleteSurvey($surveyid);
+                self::_deleteSurvey($surveyid);
                 self::_showadminmenu(false);
             }
             $this->load->view('admin/survey/deleteSurvey_view',$data);

diff --git a/application/controllers/survey.php b/application/controllers/survey.php
@@ -984,7 +984,7 @@ function _canUserPreviewSurvey($surveyId)
         $rightresult = db_execute_assoc(
         	"SELECT uid
         	FROM ".($this->db->dbprefix('survey_permissions'))."
-        	WHERE sid = '".$this->db->escape($surveyId)."'
+        	WHERE sid = ".$this->db->escape($surveyId)."
         	AND uid = '".$this->db->escape($_SESSION['loginID'])."'
         	GROUP BY uid");
         if ($rightresult->num_rows() > 0 || $_SESSION['USER_RIGHT_SUPERADMIN'] == 1)
@@ -1031,7 +1031,7 @@ function _printMessage($asLines)
         if ( func_num_args() > 1 )
             $asLines = func_get_args();
 
-        if ( size($asLines) == 0 )
+        if ( count($asLines) == 0 )
             return;
 
         $sError = array_shift($asLines);