Stupid mistakes

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_yii@11856 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Jan 3, 2012 · 5ac6c20 · 5ac6c20
1 parent 9bc31a2
commit 5ac6c20
Showing 1 changed file with 1 addition and 10 deletions.
diff --git a/application/controllers/AdminController.php b/application/controllers/AdminController.php
@@ -146,7 +146,7 @@ public function getActionClasses()
 			'authentication'   => 'authentication',
 			'browse'           => 'browse',
 			'checkintegrity'   => 'checkintegrity',
-			'conditions'       => 'conditions',
+			'conditions'       => 'conditionsaction',
 			'database'         => 'database',
 			'dataentry'        => 'dataentry',
 			'dumpdb'           => 'dumpdb',
@@ -221,15 +221,6 @@ public function _GetSessionUserRights($loginID)
 			Yii::app()->session['USER_RIGHT_INITIALSUPERADMIN'] = 0;
 	}
 
-    function createUrl($route, $params = array(), $ampersand = '&')
-    {
-        $url = parent::createUrl($route, $params, $ampersand);
-
-        $url = str_replace('/sa/', '/', $url);
-
-        return $url;
-    }
-
 	/**
 	 * Prints Admin Header
 	 *