Merged r6812:6837 from 1.7 branch to trunk (skipping some changes to plugins like groups and wire)

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

4 files changed, 34 insertions, 30 deletions

diff --git a/mod/embed/views/default/object/default/embed.php b/mod/embed/views/default/object/default/embed.php
index 6f698a157..aca2ceea1 100644
--- a/mod/embed/views/default/object/default/embed.php
+++ b/mod/embed/views/default/object/default/embed.php
@@ -1,5 +1,6 @@
 <?php
-	if ($vars['entity'] instanceof ElggObject) {
-		echo '<a href="'. $vars['entity']->getURL() .'">' . $vars['entity']->title . '</a>';
-	}
-?>
\ No newline at end of file
+
+if ($vars['entity'] instanceof ElggObject) {
+	$title = htmlspecialchars($vars['entity']->title, ENT_QUOTES);
+	echo "<a href=\"{$vars['entity']->getURL()}\">$title</a>";
+}
diff --git a/mod/reportedcontent/languages/en.php b/mod/reportedcontent/languages/en.php
index 97b86d242..8fb1b6f5a 100644
--- a/mod/reportedcontent/languages/en.php
+++ b/mod/reportedcontent/languages/en.php
@@ -18,15 +18,14 @@
 			'item:object:reported_content' => 'Reported items',
 			'reportedcontent' => 'Reported content',
 			'reportedcontent:this' => 'Report this',
-			'reportedcontent:this:title' => 'Report this page to the site administrator for review',
-			'reportedcontent:none' => 'There is no reported content at this time.',
+			'reportedcontent:none' => 'There is no reported content',
 			'reportedcontent:report' => 'Report to admin',
 			'reportedcontent:title' => 'Page title',
 			'reportedcontent:deleted' => 'The reported content has been deleted',
 			'reportedcontent:notdeleted' => 'We were not able to delete that report',
-			'reportedcontent:delete' => 'Delete',
+			'reportedcontent:delete' => 'Delete report',
 			'reportedcontent:areyousure' => 'Are you sure you want to delete?',
-			'reportedcontent:archive' => 'Archive',
+			'reportedcontent:archive' => 'Archive report',
 			'reportedcontent:archived' => 'The report has been archived',
 			'reportedcontent:visit' => 'Visit reported item',
 			'reportedcontent:by' => 'Report by',
@@ -39,7 +38,7 @@
 			'reportedcontent:failing' => 'Your report could not be sent',
 			'reportedcontent:report' => 'Report this', 
 			'reportedcontent:moreinfo' => 'More info',
-			'reportedcontent:warning' => 'Please don\'t abuse the reporting service.',
+	
 			'reportedcontent:failed' => 'Sorry, the attempt to report this content has failed.',
 			'reportedcontent:notarchived' => 'We were not able to archive that report',
 	);
diff --git a/mod/search/start.php b/mod/search/start.php
index ae5e71c97..4f42c5391 100644
--- a/mod/search/start.php
+++ b/mod/search/start.php
@@ -39,7 +39,8 @@ function search_init() {
 
 	// can't use get_data() here because some servers don't have these globals set,
 	// which throws a db exception.
-	$r = mysql_query('SELECT @@ft_min_word_len as min, @@ft_max_word_len as max');
+	$dblink = get_db_link('read');
+	$r = mysql_query('SELECT @@ft_min_word_len as min, @@ft_max_word_len as max', $dblink);
 	if ($r && ($word_lens = mysql_fetch_assoc($r))) {
 		$CONFIG->search_info['min_chars'] = $word_lens['min'];
 		$CONFIG->search_info['max_chars'] = $word_lens['max'];
diff --git a/mod/twitter/views/default/widgets/twitter/view.php b/mod/twitter/views/default/widgets/twitter/view.php
index 4ae0d7f27..3fba5b54d 100644
--- a/mod/twitter/views/default/widgets/twitter/view.php
+++ b/mod/twitter/views/default/widgets/twitter/view.php
@@ -1,5 +1,6 @@
-<?php    
- /**
+<?php
+
+/**
  * Elgg twitter view page
  *
  * @package ElggTwitter
@@ -8,25 +9,27 @@
  * @copyright Curverider Ltd 2008-2010
  * @link http://elgg.com/
  */
- 
- //some required params
- 
- $username = $vars['entity']->twitter_username;
- $num = $vars['entity']->twitter_num;
- 
+
+//some required params
+
+$username = $vars['entity']->twitter_username;
+$num = $vars['entity']->twitter_num;
+
 // if the twitter username is empty, then do not show
-if($username){
-	 
+if ($username) {
+
 ?>
 
 <div id="twitter_widget">
-<ul id="twitter_update_list"></ul>
-<p class="visit_twitter"><a href="http://twitter.com/<?php echo $username; ?>"><?php echo elgg_echo("twitter:visit"); ?></a></p>
-<script type="text/javascript" src="http://twitter.com/javascripts/blogger.js"></script>
-<script type="text/javascript" src="http://twitter.com/statuses/user_timeline/<?php echo $username; ?>.json?callback=twitterCallback2&count=<?php echo $num; ?>"></script>
-<?php 
-    } else {
-      echo "<p>" . elgg_echo("twitter:notset") . ".</p>";
-  }
-?>
-</div>
\ No newline at end of file
+	<ul id="twitter_update_list"></ul>
+	<p class="visit_twitter"><a href="http://twitter.com/<?php echo $username; ?>"><?php echo elgg_echo("twitter:visit"); ?></a></p>
+	<script type="text/javascript" src="http://twitter.com/javascripts/blogger.js"></script>
+	<script type="text/javascript" src="http://twitter.com/statuses/user_timeline/<?php echo $username; ?>.json?callback=twitterCallback2&count=<?php echo $num; ?>"></script>
+</div>
+
+<?php
+} else {
+
+	echo "<p>" . elgg_echo("twitter:notset") . ".</p>";
+
+}