Fix some minor issues

olafgleba · Sep 14, 2012 · d90f69d · d90f69d
1 parent 7d8e192
commit d90f69d
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 43 deletions.
diff --git a/welcompose/admin/callbacks.php b/welcompose/admin/callbacks.php
@@ -254,7 +254,7 @@
 				$syntax = '{select_named ns="[Application|Community|Content|Media]" class="[classToUse]" method="[classMethodToUse]" var="[variable]"}';
 			break;
 			case 'tag_cloud' :
-				$syntax = '{tag_cloud page=$page.id var="[variable]" type="[variable]" limit="[number]" range="[number]"}';
+				$syntax = '{tag_cloud page=$page.id var="[variable]" type="[blog|event]" limit="[number]" range="[number]"}';
 			break;
 			case 'get_glossary' :
 				$syntax = '{get_glossary var="[variable]" action="[pager|content]"}';

diff --git a/welcompose/admin/content/pages_blogs_postings_copy.php b/welcompose/admin/content/pages_blogs_postings_copy.php
@@ -519,17 +519,6 @@
 			'response' => Base_Cnc::filterRequest($_SESSION['response'], WCOM_REGEX_NUMERIC),
 			'preview_ctrl' => Base_Cnc::filterRequest($_SESSION['preview_ctrl'], WCOM_REGEX_NUMERIC)
 		);
-
-		// assign $_SESSION to smarty
-		$BASE->utility->smarty->assign('session', $session);
-
-		// empty $_SESSION
-		if (!empty($_SESSION['response'])) {
-			$_SESSION['response'] = '';
-		}	
-		if (!empty($_SESSION['preview_ctrl'])) {
-		  	$_SESSION['preview_ctrl'] = '';
-		}
 
 		// select available projects
 		$select_params = array(
@@ -738,20 +727,6 @@
 				}
 			}
 		}
-
-		// add response to session
-		$_SESSION['response'] = 1;
-
-		// preview control value
-		$activePreview = $preview->getValue();
-
-		// add preview_ctrl to session
-		if (!empty($activePreview)) {
-			$_SESSION['preview_ctrl'] = 1;
-		}
-
-		// redirect
-		$SESSION->save();
 
 		// clean the buffer
 		if (!$BASE->debug_enabled()) {

diff --git a/welcompose/admin/content/pages_events_postings_copy.php b/welcompose/admin/content/pages_events_postings_copy.php
@@ -293,19 +293,6 @@
 		// assign current user and project id
 		$BASE->utility->smarty->assign('wcom_current_user', WCOM_CURRENT_USER);
 		$BASE->utility->smarty->assign('wcom_current_project', WCOM_CURRENT_PROJECT);
-
-		// build session
-		$session = array(
-			'response' => Base_Cnc::filterRequest($_SESSION['response'], WCOM_REGEX_NUMERIC)
-		);
-
-		// assign $_SESSION to smarty
-		$BASE->utility->smarty->assign('session', $session);
-
-		// empty $_SESSION
-		if (!empty($_SESSION['response'])) {
-			$_SESSION['response'] = '';
-		}
 
 		// select available projects
 		$select_params = array(
@@ -418,9 +405,6 @@
 			throw $e;
 		}
 
-		// add response to session
-		$_SESSION['response'] = 1;
-
 		// clean the buffer
 		if (!$BASE->debug_enabled()) {
 			@ob_end_clean();

diff --git a/welcompose/admin/smarty/templates/help/template_template_sets.html b/welcompose/admin/smarty/templates/help/template_template_sets.html
@@ -1 +1 @@
-<p class="help">{i18n 'Select the template sets where you'll like to use your template. Press CTRL (on PC) or Command (on Mac) to select or deselect multiple template sets.'}</p>
+<p class="help">{i18n 'Select the template sets where you&#39;ll like to use your template. Press CTRL (on PC) or Command (on Mac) to select or deselect multiple template sets.'}</p>
diff --git a/welcompose/core/display_classes/generatorformindex.class.php b/welcompose/core/display_classes/generatorformindex.class.php
@@ -394,6 +394,7 @@ public function render ()
 					// prepare attributes
 					$attributes = array(
 						'id' => $field_id,
+						'value' => $_field['label'],
 						'class' => (!empty($_field['class'])) ? 'fsubmit '. $_field['class'] : 'fsubmit'
 					);					
 					// create element

diff --git a/welcompose/core/templating_classes/template.class.php b/welcompose/core/templating_classes/template.class.php
@@ -744,6 +744,9 @@ public function testForUniqueTypeAndSet ($type, $id = null)
 		throw new Templating_TemplateException("You are not allowed to perform this action");
 	}
 
+	// define some vars
+	$set = null;	
+
 	// input check
 	if (empty($type)) {
 		throw new Templating_TemplateException("Input for parameter type is not expected to be empty");