Merged 1.7 bugfixes back into core. (5376:HEAD).

git-svn-id: http://code.elgg.org/elgg/trunk@5471 36083f99-b078-4883-b0ff-0f9b5a30f544

2 files changed, 6 insertions, 21 deletions

diff --git a/mod/externalpages/actions/add.php b/mod/externalpages/actions/add.php
index f8746312c..79f16bad5 100644
--- a/mod/externalpages/actions/add.php
+++ b/mod/externalpages/actions/add.php
@@ -16,17 +16,12 @@
 	// Get input data
 		$contents = get_input('expagescontent', '', false);
 		$type = get_input('content_type');
-		$tags = get_input('expagestags');
 		$previous_guid = get_input('expage_guid');
 
 	// Cache to the session
 		$_SESSION['expages_content'] = $contents;
 		$_SESSION['expagestype'] = $type;
-		$_SESSION['expagestags'] = $tags;
-		
-	// Convert string of tags into a preformatted array
-		$tagarray = string_to_tag_array($tags);
-		
+				
 	// Make sure the content exists
 		if (empty($contents)) {
 			register_error(elgg_echo("expages:blank"));
@@ -47,7 +42,7 @@
 		// Set its owner to the current user
 			$expages->owner_guid = $_SESSION['user']->getGUID();
 		// For now, set its access to public
-			$expages->access_id = 2;
+			$expages->access_id = ACCESS_PUBLIC;
 		// Set its title and description appropriately
 			$expages->title = $type;
 			$expages->description = $contents;
@@ -56,17 +51,13 @@
 				register_error(elgg_echo("expages:error"));
 				forward("mod/expages/add.php");
 			}
-		// Now let's add tags. We can pass an array directly to the object property! Easy.
-			if (is_array($tagarray)) {
-				$expages->tags = $tagarray;
-			}
 						
 		// Success message
 			system_message(elgg_echo("expages:posted"));
 		// add to river
 		    add_to_river('river/expages/create','create',$_SESSION['user']->guid,$expages->guid);
 		// Remove the cache
-			unset($_SESSION['expages_content']); unset($_SESSION['expagestitle']); unset($_SESSION['expagestags']);
+			unset($_SESSION['expages_content']); unset($_SESSION['expagestitle']);
 						
 		
 	// Forward back to the page
@@ -74,4 +65,4 @@
 				
 		}
 		
-?>
+?>
\ No newline at end of file
diff --git a/mod/externalpages/views/default/expages/forms/edit.php b/mod/externalpages/views/default/expages/forms/edit.php
index 2f638d549..154b621fc 100644
--- a/mod/externalpages/views/default/expages/forms/edit.php
+++ b/mod/externalpages/views/default/expages/forms/edit.php
@@ -23,21 +23,17 @@
 	if($page_contents){
 		 foreach($page_contents as $pc){
 			 $description = $pc->description;
-			 $tags = $pc->tags;
 			 $guid = $pc->guid;
 		 }
 	}else {		
-		$tags = "";
 		$description = "";
 	}
 		
 	// set the required form variables
 		$input_area = elgg_view('input/longtext', array('internalname' => 'expagescontent', 'value' => $description));
-		$tag_input = elgg_view('input/tags', array('internalname' => 'expagestags', 'value' => $tags));
         $submit_input = elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('save')));
 		$hidden_value = elgg_view('input/hidden', array('internalname' => 'content_type', 'value' => $type));
 		$hidden_guid = elgg_view('input/hidden', array('internalname' => 'expage_guid', 'value' => $guid));
-		$tag_label = elgg_echo('tags') . "<br/>";  
 		
 		//type
 		$type = $vars['type'];
@@ -61,10 +57,6 @@
 
 		<h3 class='settings'>$external_page_title</h3>
 		<p class='longtext_editarea'>$input_area</p>
-		<p>
-			$tag_label
-			$tag_input
-		</p>
 			$hidden_value
 			$hidden_guid
 			<br />
@@ -83,10 +75,12 @@ EOT;
 <a name="preview"></a>
 <h2>Preview</h2>
 <?php 
+/*
 	if($description)
 		echo $description;
 	else
 		echo elgg_echo('expages:nopreview');
+*/
 ?>
 </div>
 -->
\ No newline at end of file