Fixed issue #6351: Error when deleting a user

LimeSurvey · Jul 26, 2012 · 59d567c · 59d567c
1 parent a6b43b4
commit 59d567c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 15 deletions.
diff --git a/application/controllers/admin/useraction.php b/application/controllers/admin/useraction.php
@@ -223,7 +223,7 @@ function deluser()
                     }
 
                     if ($action == "finaldeluser") {
-                        $this->deleteFinalUser($ownerUser, $transfer_surveys_to);
+                        $aViewUrls=$this->deleteFinalUser($ownerUser, $transfer_surveys_to);
                     }
                     else
                     {
@@ -246,7 +246,7 @@ function deluser()
             }
         }
 
-        $this->_renderWrappedTemplate('user', $aViewUrls);
+        return $aViewUrls;
     }
 
     function deleteFinalUser($result, $transfer_surveys_to)

diff --git a/index.php b/index.php
@@ -1,17 +1,5 @@
 <?php
 
-/*
- *---------------------------------------------------------------
- * PHP ERROR REPORTING LEVEL
- *---------------------------------------------------------------
- *
- * By default CI runs with error reporting set to ALL.  For security
- * reasons you are encouraged to change this to 0 when your site goes live.
- * For more info visit:  http://www.php.net/error_reporting
- *
- */
-	error_reporting(E_ALL);
-
 /*
  *---------------------------------------------------------------
  * SYSTEM FOLDER NAME
@@ -157,9 +145,10 @@
 	}
 
     $aSettings= include(APPPATH.'config'.DIRECTORY_SEPARATOR.'config.php');
-    if ($aSettings['config']['debug']>0)
+    if (isset($aSettings['config']['debug']) && $aSettings['config']['debug']>0)
     {
         define('YII_DEBUG', true);
+        error_reporting(E_ALL);
     }
     else
     {