From eff4faea7f3c95440f02ea45d0be4f67236e2bf3 Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Wed, 3 Nov 2010 22:13:10 +0000
Subject: Fixes #1320: Bundled mods use elgg_echo()'s internal string
 substitution.

git-svn-id: http://code.elgg.org/elgg/trunk@7229 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/file/views/default/object/file.php             | 84 +++++++++++-----------
 .../views/default/river/object/file/create.php     |  6 +-
 2 files changed, 45 insertions(+), 45 deletions(-)

(limited to 'mod/file/views')

diff --git a/mod/file/views/default/object/file.php b/mod/file/views/default/object/file.php
index 5858a1f1e..3da9567a5 100644
--- a/mod/file/views/default/object/file.php
+++ b/mod/file/views/default/object/file.php
@@ -2,14 +2,14 @@
 	/**
 	 * Elgg file browser.
 	 * File renderer.
-	 * 
+	 *
 	 * @package ElggFile
 	 */
 
 	global $CONFIG;
-	
+
 	$file = $vars['entity'];
-	
+
 	$file_guid = $file->getGUID();
 	$tags = $file->tags;
 	$title = $file->title;
@@ -17,13 +17,13 @@
 	$owner = $vars['entity']->getOwnerEntity();
 	$friendlytime = elgg_view_friendly_time($vars['entity']->time_created);
 	$mime = $file->mimetype;
-	
+
 	if (!$title) {
 		$title = elgg_echo('untitled');
 	}
-	
+
 	if (elgg_get_context() == "search") { 	// Start search listing version
-		
+
 		if (get_input('search_viewtype') == "gallery") {
 			echo "<div class='filerepo_gallery_item'>";
 			if ($vars['entity']->smallthumb) {
@@ -34,25 +34,25 @@
 				//get the number of comments
 				$numcomments = elgg_count_comments($vars['entity']);
 				if ($numcomments)
-					echo "<p class='filerepo_comments'><a href=\"{$file->getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")</a></p>";
+					echo "<p class='filerepo_comments'><a href=\"{$file->getURL()}\">" . elgg_echo("comments") . " (" . $numcomments . ")</a></p>";
+
 
-				
 				//if the user can edit, display edit and delete links
 				if ($file->canEdit()) {
 					echo "<div class='filerepo_controls'><p>";
 					echo "<a href=\"".elgg_get_site_url()."mod/file/edit.php?file_guid={$file->getGUID()}\">" . elgg_echo('edit') . "</a>&nbsp;";
 					echo elgg_view('output/confirmlink',array(
-						
+
 							'href' => "action/file/delete?file=" . $file->getGUID(),
 							'text' => elgg_echo("delete"),
 							'confirm' => elgg_echo("file:delete:confirm"),
 							'is_action' => true,
-						
+
 						));
 					echo "</p></div>";
 				}
-					
-			
+
+
 			} else {
 				echo "<p class='filerepo_title'>{$title}</p>";
 				echo "<a href=\"{$file->getURL()}\">" . elgg_view("file/icon", array("mimetype" => $mime, 'thumbnail' => $file->thumbnail, 'file_guid' => $file_guid, 'size' => 'large')) . "</a>";
@@ -60,58 +60,58 @@
 				//get the number of comments
 				$numcomments = elgg_count_comments($file);
 				if ($numcomments)
-					echo "<p class='filerepo_comments'><a href=\"{$file->getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")</a></p>";
+					echo "<p class='filerepo_comments'><a href=\"{$file->getURL()}\">" . elgg_echo("comments") . " (" . $numcomments . ")</a></p>";
 
 			}
 			echo "</div>";
-			
+
 		} else {
-		
+
 			$info = "<p class='entity_title'> <a href=\"{$file->getURL()}\">{$title}</a></p>";
 			$info .= "<p class='entity_subtext'><a href=\"".elgg_get_site_url()."pg/file/{$owner->username}\">{$owner->name}</a> {$friendlytime}";
 			$numcomments = elgg_count_comments($file);
 			if ($numcomments)
-				$info .= ", <a href=\"{$file->getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")</a>";
+				$info .= ", <a href=\"{$file->getURL()}\">" . elgg_echo("comments") . " (" . $numcomments . ")</a>";
 			$info .= "</p>";
 			$icon = "<a href=\"{$file->getURL()}\">" . elgg_view("file/icon", array("mimetype" => $mime, 'thumbnail' => $file->thumbnail, 'file_guid' => $file_guid, 'size' => 'small')) . "</a>";
-			
+
 			echo elgg_view_listing($icon, $info);
-		
+
 		}
-		
+
 	} else { // Start main version
-	
+
 ?>
 	<div class="filerepo_file">
 		<div class="filerepo_icon">
-					<a href="<?php echo elgg_get_site_url(); ?>mod/file/download.php?file_guid=<?php echo $file_guid; ?>"><?php 
-						
-						echo elgg_view("file/icon", array("mimetype" => $mime, 'thumbnail' => $file->thumbnail, 'file_guid' => $file_guid)); 
-						
-					?></a>					
+					<a href="<?php echo elgg_get_site_url(); ?>mod/file/download.php?file_guid=<?php echo $file_guid; ?>"><?php
+
+						echo elgg_view("file/icon", array("mimetype" => $mime, 'thumbnail' => $file->thumbnail, 'file_guid' => $file_guid));
+
+					?></a>
 		</div>
-		
+
 		<div class="filerepo_title_owner_wrapper">
 		<?php
 			//get the user and a link to their gallery
 			$user_gallery = elgg_get_site_url() . "mod/file/search.php?md_type=simpletype&subtype=file&tag=image&owner_guid=" . $owner->guid . "&search_viewtype=gallery";
 		?>
-		<div class="filerepo_user_gallery_link"><a href="<?php echo $user_gallery; ?>"><?php echo sprintf(elgg_echo("file:user:gallery"),''); ?></a></div>
+		<div class="filerepo_user_gallery_link"><a href="<?php echo $user_gallery; ?>"><?php echo elgg_echo("file:user:gallery",array('')); ?></a></div>
 		<div class="filerepo_title"><h2><a href="<?php echo elgg_get_site_url(); ?>mod/file/download.php?file_guid=<?php echo $file_guid; ?>"><?php echo $title; ?></a></h2></div>
 		<div class="filerepo_owner">
 				<?php
 
 					echo elgg_view("profile/icon",array('entity' => $owner, 'size' => 'tiny'));
-				
+
 				?>
 				<p class="filerepo_owner_details"><b><a href="<?php echo elgg_get_site_url(); ?>pg/file/<?php echo $owner->username; ?>"><?php echo $owner->name; ?></a></b><br />
 				<small><?php echo $friendlytime; ?></small></p>
 		</div>
 		</div>
 
-		
+
 		<div class="filerepo_maincontent">
-		
+
 		<div class="filerepo_description"><?php echo elgg_view('output/longtext', array('value' => $desc)); ?></div>
 <?php
 
@@ -129,17 +129,17 @@
 		}
 
 ?>
-		<?php 
+		<?php
 			if (elgg_view_exists('file/specialcontent/' . $mime)) {
 				echo "<div class='filerepo_specialcontent'>".elgg_view('file/specialcontent/' . $mime, $vars)."</div>";
 			} else if (elgg_view_exists("file/specialcontent/" . substr($mime,0,strpos($mime,'/')) . "/default")) {
 				echo "<div class='filerepo_specialcontent'>".elgg_view("file/specialcontent/" . substr($mime,0,strpos($mime,'/')) . "/default", $vars)."</div>";
 			}
-		
+
 		?>
-		
+
 		<div class="filerepo_download"><p><a class="action_button small" href="<?php echo elgg_get_site_url(); ?>mod/file/download.php?file_guid=<?php echo $file_guid; ?>"><?php echo elgg_echo("file:download"); ?></a></p></div>
-		
+
 <?php
 
 	if ($file->canEdit()) {
@@ -147,21 +147,21 @@
 
 	<div class="filerepo_controls">
 				<p>
-					<a href="<?php echo elgg_get_site_url(); ?>mod/file/edit.php?file_guid=<?php echo $file->getGUID(); ?>"><?php echo elgg_echo('edit'); ?></a>&nbsp; 
-					<?php 
+					<a href="<?php echo elgg_get_site_url(); ?>mod/file/edit.php?file_guid=<?php echo $file->getGUID(); ?>"><?php echo elgg_echo('edit'); ?></a>&nbsp;
+					<?php
 						echo elgg_view('output/confirmlink',array(
-						
+
 							'href' => "action/file/delete?file=" . $file->getGUID(),
 							'text' => elgg_echo("delete"),
 							'confirm' => elgg_echo("file:delete:confirm"),
 							'is_action' => true,
-						
-						));  
+
+						));
 					?>
 				</p>
 	</div>
 
-<?php		
+<?php
 	}
 
 ?>
@@ -171,9 +171,9 @@
 <?php
 
 	if ($vars['full']) {
-		
+
 		echo elgg_view_comments($file);
-		
+
 	}
 
 ?>
diff --git a/mod/file/views/default/river/object/file/create.php b/mod/file/views/default/river/object/file/create.php
index b0e2ca07b..b9b5c4299 100644
--- a/mod/file/views/default/river/object/file/create.php
+++ b/mod/file/views/default/river/object/file/create.php
@@ -4,14 +4,14 @@
 	$object = get_entity($vars['item']->object_guid);
 	$url = $object->getURL();
 	$container = get_entity($object->container_guid);
-	
+
 	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
-	$string = sprintf(elgg_echo("file:river:created"),$url) . " " . elgg_echo("file:river:item");
+	$string = elgg_echo("file:river:created", array($url)) . " " . elgg_echo("file:river:item");
 	$string .= " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
 	if ($container && $container instanceof ElggGroup) {
 		$string .= ' ' . elgg_echo('groups:river:togroup') . " <a href=\"" . $container->getURL() ."\">". $container->name . "</a>";
 	}
 
 	echo $string;
-	
+
 ?>
\ No newline at end of file
-- 
cgit v1.2.3