Merge branch 'Yii' of https://github.com/LimeSurvey/LimeSurvey into Yii

LimeSurvey · Jun 27, 2012 · cee41ba · cee41ba
2 parents 1c7d9d1 + 70ee277
commit cee41ba
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/application/controllers/admin/translate.php b/application/controllers/admin/translate.php
@@ -291,7 +291,7 @@ private function _getSurveyButton($surveyid, $menuitem_url)
 	{
 		$survey_button = "";
 
-        $imageurl = Yii::app()->getConfig("imageurl");
+        $imageurl = Yii::app()->getConfig("adminimageurl");
         $clang = Yii::app()->lang;
 
         $baselang = Survey::model()->findByPk($surveyid)->language;
@@ -990,7 +990,10 @@ private function displayTranslateFieldsFooter()
     */
     private function menuItem( $jsMenuText, $menuImageText, $menuImageFile, $scriptname)
     {
-		$img_tag = CHtml::image(Yii::app()->getConfig("imageurl") . "/" . $menuImageFile, $jsMenuText, array('name'=>$menuImageText));
+
+        $imageurl = Yii::app()->getConfig("adminimageurl");
+
+		$img_tag = CHtml::image($imageurl . "/" . $menuImageFile, $jsMenuText, array('name'=>$menuImageText));
 		$menuitem = CHtml::link($img_tag, '#', array(
 			'onclick' => "window.open('{$scriptname}', '_top')"
 		));
@@ -1003,7 +1006,10 @@ private function menuItem( $jsMenuText, $menuImageText, $menuImageFile, $scriptn
     */
     private function menuSeparator()
     {
-		$image = CHtml::image(Yii::app()->getConfig("imageurl") . "/separator.gif", '');
+
+        $imageurl = Yii::app()->getConfig("adminimageurl");
+
+		$image = CHtml::image($imageurl . "/separator.gif", '');
         return $image;
     }