Upgraded to Elgg 1.8.6.

Merge tag '1.8.6' of git://github.com/Elgg/Elgg into lorea-preprod Elgg 1.8.6 release
author: Sem <sembrestels@riseup.net> 2012-07-01 23:20:47 +0200
committer: Sem <sembrestels@riseup.net> 2012-07-01 23:20:47 +0200
commit: 671f9ba4e1b1972d8eaf22acfb626fa2c85af0f2 (patch)
tree: 436b0de846650bce13436b51a2d5214224f8898c /views
parent: 3da3f2aa28a42c23bdc9d661e7e13fd6f2bd2b10 (diff)
parent: b91d8bb0fea5cef9fafea72181a0007cfaa54725 (diff)
download: elgg-671f9ba4e1b1972d8eaf22acfb626fa2c85af0f2.tar.gz
elgg-671f9ba4e1b1972d8eaf22acfb626fa2c85af0f2.tar.bz2
20 files changed, 195 insertions, 213 deletions
diff --git a/views/default/admin/statistics/server/php.php b/views/default/admin/statistics/server/php.php
index 4a59b95fb..7c6a51383 100644
--- a/views/default/admin/statistics/server/php.php
+++ b/views/default/admin/statistics/server/php.php
@@ -8,6 +8,15 @@ if (!$php_log) {
 	$php_log = elgg_echo('admin:server:error_log');
 }
 
+$post_max_size = elgg_get_ini_setting_in_bytes('post_max_size');
+$upload_max_filesize = elgg_get_ini_setting_in_bytes('upload_max_filesize');
+
+$post_max_size_warning = '';
+if ($upload_max_filesize > $post_max_size) {
+	// @todo show a link to something like http://nigel.mcnie.name/blog/uploadmaxfilesizepostmaxsize-experimentation ?
+	$post_max_size_warning = elgg_echo('admin:server:warning:post_max_too_small');
+}
+
 ?>
 <table class="elgg-table-alt">
 	<tr class="odd">
@@ -30,4 +39,12 @@ if (!$php_log) {
 		<td><b><?php echo elgg_echo('admin:server:label:mem_used'); ?> :</b></td>
 		<td><?php echo number_format(memory_get_peak_usage()); ?></td>
 	</tr>
+	<tr class="even">
+		<td><b><?php echo elgg_echo('admin:server:label:post_max_size'); ?> :</b></td>
+		<td><?php echo number_format($post_max_size); ?></td>
+	</tr>
+	<tr class="odd">
+		<td><b><?php echo elgg_echo('admin:server:label:upload_max_filesize'); ?> :</b></td>
+		<td><?php echo number_format($upload_max_filesize) . '&nbsp; ' . $post_max_size_warning; ?></td>
+	</tr>
 </table>
diff --git a/views/default/core/avatar/upload.php b/views/default/core/avatar/upload.php
index 29aa59c9c..6f9124192 100644
--- a/views/default/core/avatar/upload.php
+++ b/views/default/core/avatar/upload.php
@@ -12,12 +12,12 @@ $user_avatar = elgg_view('output/img', array(
 
 $current_label = elgg_echo('avatar:current');
 
-$revert_button = '';
+$remove_button = '';
 if ($vars['entity']->icontime) {
-	$revert_button = elgg_view('output/url', array(
-		'text' => elgg_echo('revert'),
-		'title' => elgg_echo('avatar:revert'),
-		'href' => 'action/avatar/revert?guid=' . elgg_get_page_owner_guid(),
+	$remove_button = elgg_view('output/url', array(
+		'text' => elgg_echo('remove'),
+		'title' => elgg_echo('avatar:remove'),
+		'href' => 'action/avatar/remove?guid=' . elgg_get_page_owner_guid(),
 		'is_action' => true,
 		'class' => 'elgg-button elgg-button-cancel mll',
 	));
@@ -39,7 +39,7 @@ $image = <<<HTML
 	<label>$current_label</label><br />
 	$user_avatar
 </div>
-$revert_button
+$remove_button
 HTML;
 
 $body = <<<HTML
diff --git a/views/default/core/river/filter.php b/views/default/core/river/filter.php
index 87380b561..9b7fadaa8 100644
--- a/views/default/core/river/filter.php
+++ b/views/default/core/river/filter.php
@@ -34,17 +34,5 @@ if ($selector) {
 	$params['value'] = $selector;
 }
 echo elgg_view('input/dropdown', $params);
-?>
-<?php //@todo JS 1.8: no ?>
-<script type="text/javascript">
-elgg.register_hook_handler('init', 'system', function() {
-	$('#elgg-river-selector').change(function() {
-		var url = window.location.href;
-		if (window.location.search.length) {
-			url = url.substring(0, url.indexOf('?'));
-		}
-		url += '?' + $(this).val();
-		elgg.forward(url);
-	});
-});
-</script>
+
+elgg_load_js('elgg.ui.river');
diff --git a/views/default/core/settings/account/default_access.php b/views/default/core/settings/account/default_access.php
index e33211460..690f2714a 100644
--- a/views/default/core/settings/account/default_access.php
+++ b/views/default/core/settings/account/default_access.php
@@ -12,22 +12,14 @@ if (elgg_get_config('allow_user_default_access')) {
 		if (false === ($default_access = $user->getPrivateSetting('elgg_default_access'))) {
 			$default_access = elgg_get_config('default_access');
 		}
-?>
-<div class="elgg-module elgg-module-info">
-	<div class="elgg-head">
-		<h3><?php echo elgg_echo('default_access:settings'); ?></h3>
-	</div>
-	<div class="elgg-body">
-		<p>
-		<?php echo elgg_echo('default_access:label'); ?>:
-		<?php
 
-			echo elgg_view('input/access', array('name' => 'default_access', 'value' => $default_access));
+		$title = elgg_echo('default_access:settings');
+		$content = elgg_echo('default_access:label') . ': ';
+		$content .= elgg_view('input/access', array(
+			'name' => 'default_access',
+			'value' => $default_access,
+		));
 
-		?>
-		</p>
-	</div>
-</div>
-<?php
+		echo elgg_view_module('info', $title, $content);
 	}
-}
-\ No newline at end of file
+}
diff --git a/views/default/core/settings/account/email.php b/views/default/core/settings/account/email.php
index fda83e795..4bcdbb100 100644
--- a/views/default/core/settings/account/email.php
+++ b/views/default/core/settings/account/email.php
@@ -9,19 +9,11 @@
 $user = elgg_get_page_owner_entity();
 
 if ($user) {
-?>
-<div class="elgg-module elgg-module-info">
-	<div class="elgg-head">
-		<h3><?php echo elgg_echo('email:settings'); ?></h3>
-	</div>
-	<div class="elgg-body">
-		<p>
-			<?php echo elgg_echo('email:address:label'); ?>:
-			<?php
-			echo elgg_view('input/email',array('name' => 'email', 'value' => $user->email));
-			?>
-		</p>
-	</div>
-</div>
-<?php
-}
-\ No newline at end of file
+	$title = elgg_echo('email:settings');
+	$content = elgg_echo('email:address:label') . ': ';
+	$content .= elgg_view('input/email', array(
+		'name' => 'email',
+		'value' => $user->email,
+	));
+	echo elgg_view_module('info', $title, $content);
+}
diff --git a/views/default/core/settings/account/language.php b/views/default/core/settings/account/language.php
index 3a992966f..b36057422 100644
--- a/views/default/core/settings/account/language.php
+++ b/views/default/core/settings/account/language.php
@@ -9,23 +9,12 @@
 $user = elgg_get_page_owner_entity();
 
 if ($user) {
-?>
-<div class="elgg-module elgg-module-info">
-	<div class="elgg-head">
-		<h3><?php echo elgg_echo('user:set:language'); ?></h3>
-	</div>
-	<div class="elgg-body">
-		<p>
-			<?php echo elgg_echo('user:language:label'); ?>:
-			<?php
-			echo elgg_view("input/dropdown", array(
-				'name' => 'language',
-				'value' => $user->language,
-				'options_values' => get_installed_translations()
-			));
-			?>
-		</p>
-	</div>
-</div>
-<?php
-}
-\ No newline at end of file
+	$title = elgg_echo('user:set:language');
+	$content = elgg_echo('user:language:label') . ': ';
+	$content .= elgg_view("input/dropdown", array(
+		'name' => 'language',
+		'value' => $user->language,
+		'options_values' => get_installed_translations()
+	));
+	echo elgg_view_module('info', $title, $content);
+}
diff --git a/views/default/core/settings/account/name.php b/views/default/core/settings/account/name.php
index f719a84de..e356146a3 100644
--- a/views/default/core/settings/account/name.php
+++ b/views/default/core/settings/account/name.php
@@ -7,20 +7,15 @@
  */
 
 $user = elgg_get_page_owner_entity();
-?>
-<div class="elgg-module elgg-module-info">
-  <div class="elgg-head">
-		<h3><?php echo elgg_echo('user:name:label'); ?></h3>
-	</div>
-	<div class="elgg-body">
-		<p>
-			<?php echo elgg_echo('name'); ?>:
-			<?php
-			echo elgg_view('input/text', array('name' => 'name', 'value' => $user->name));
-			?>
-		</p>
-	</div>
-</div>
-<?php
-// need the user's guid to make sure the correct user gets updated
-echo elgg_view('input/hidden', array('name' => 'guid', 'value' => $user->guid));
+if ($user) {
+	$title = elgg_echo('user:name:label');
+	$content = elgg_echo('name') . ': ';
+	$content .= elgg_view('input/text', array(
+		'name' => 'name',
+		'value' => $user->name,
+	));
+	echo elgg_view_module('info', $title, $content);
+
+	// need the user's guid to make sure the correct user gets updated
+	echo elgg_view('input/hidden', array('name' => 'guid', 'value' => $user->guid));
+}
diff --git a/views/default/core/settings/account/notifications.php b/views/default/core/settings/account/notifications.php
index 51292b2c9..c212b3886 100644
--- a/views/default/core/settings/account/notifications.php
+++ b/views/default/core/settings/account/notifications.php
@@ -9,33 +9,20 @@
 global $NOTIFICATION_HANDLERS;
 $notification_settings = get_user_notification_settings(elgg_get_page_owner_guid());
 
-?>
-<div class="elgg-module elgg-module-info">
-	<div class="elgg-head">
-		<h3><?php echo elgg_echo('notifications:usersettings'); ?></h3>
-	</div>
-	<div class="elgg-body">
+$title = elgg_echo('notifications:usersettings');
 
-<p><?php echo elgg_echo('notifications:methods'); ?>
+$rows = '';
 
-<table>
-<?php
-	// Loop through options
-	foreach ($NOTIFICATION_HANDLERS as $k => $v) {
-?>
-		<tr>
-			<td><?php echo elgg_echo("notification:method:$k"); ?>: </td>
-
-			<td>
-<?php
+// Loop through options
+foreach ($NOTIFICATION_HANDLERS as $k => $v) {
 
 	if ($notification_settings->$k) {
 		$val = "yes";
 	} else {
 		$val = "no";
 	}
-	
-	echo elgg_view('input/radio', array(
+
+	$radio = elgg_view('input/radio', array(
 		'name' => "method[$k]",
 		'value' => $val,
 		'options' => array(
@@ -44,12 +31,14 @@ $notification_settings = get_user_notification_settings(elgg_get_page_owner_guid
 		),
 	));
 
-?>
-			</td>
-		</tr>
-<?php
-	}
-?>
-</table>
-	</div>
-</div>
-\ No newline at end of file
+	$cells = '<td class="prm pbl">' . elgg_echo("notification:method:$k") . ': </td>';
+	$cells .= "<td>$radio</td>";
+
+	$rows .= "<tr>$cells</tr>";
+}
+
+
+$content = elgg_echo('notifications:methods');
+$content .= "<table>$rows</table>";
+
+echo elgg_view_module('info', $title, $content);
diff --git a/views/default/core/settings/account/password.php b/views/default/core/settings/account/password.php
index a80f3df6b..4857034b2 100644
--- a/views/default/core/settings/account/password.php
+++ b/views/default/core/settings/account/password.php
@@ -1,45 +1,33 @@
 <?php
+
 /**
  * Provide a way of setting your password
  *
  * @package Elgg
  * @subpackage Core
  */
-
 $user = elgg_get_page_owner_entity();
 
 if ($user) {
-?>
-<div class="elgg-module elgg-module-info">
-	<div class="elgg-head">
-		<h3><?php echo elgg_echo('user:set:password'); ?></h3>
-	</div>
-	<div class="elgg-body">
-		<?php
-			// only make the admin user enter current password for changing his own password.
-			if (!elgg_is_admin_logged_in() || elgg_is_admin_logged_in() && $user->guid == elgg_get_logged_in_user_guid()) {
-		?>
-		<p>
-		<?php echo elgg_echo('user:current_password:label'); ?>:
-		<?php
-			echo elgg_view('input/password', array('name' => 'current_password'));
-		?>
-		</p>
-		<?php } ?>
+	$title = elgg_echo('user:set:password');
 
-		<p>
-		<?php echo elgg_echo('user:password:label'); ?>:
-		<?php
-			echo elgg_view('input/password', array('name' => 'password'));
-		?>
-		</p>
+	// only make the admin user enter current password for changing his own password.
+	$admin = '';
+	if (!elgg_is_admin_logged_in() || elgg_is_admin_logged_in() && $user->guid == elgg_get_logged_in_user_guid()) {
+		$admin .= elgg_echo('user:current_password:label') . ': ';
+		$admin .= elgg_view('input/password', array('name' => 'current_password'));
+		$admin = "<p>$admin</p>";
+	}
 
-		<p>
-		<?php echo elgg_echo('user:password2:label'); ?>: <?php
-			echo elgg_view('input/password', array('name' => 'password2'));
-		?>
-		</p>
-	</div>
-</div>
-<?php
-}
-\ No newline at end of file
+	$password = elgg_echo('user:password:label') . ': ';
+	$password .= elgg_view('input/password', array('name' => 'password'));
+	$password = "<p>$password</p>";
+
+	$password2 = elgg_echo('user:password2:label') . ': ';
+	$password2 .= elgg_view('input/password', array('name' => 'password2'));
+	$password2 = "<p>$password2</p>";
+
+	$content = $admin . $password . $password2;
+
+	echo elgg_view_module('info', $title, $content);
+}
diff --git a/views/default/core/settings/statistics/numentities.php b/views/default/core/settings/statistics/numentities.php
index 245fd67be..ce1705a2e 100644
--- a/views/default/core/settings/statistics/numentities.php
+++ b/views/default/core/settings/statistics/numentities.php
@@ -10,42 +10,35 @@
 $entity_stats = get_entity_statistics(elgg_get_logged_in_user_guid());
 
 if ($entity_stats) {
-?>
-<div class="elgg-module elgg-module-info">
-	<div class="elgg-head">
-		<h3><?php echo elgg_echo('usersettings:statistics:label:numentities'); ?></h3>
-	</div>
-	<div class="elgg-body">
-		<table class="elgg-table-alt">
-		<?php
-			foreach ($entity_stats as $k => $entry) {
-				foreach ($entry as $a => $b) {
+	$rows = '';
+	foreach ($entity_stats as $k => $entry) {
+		foreach ($entry as $a => $b) {
 
-					//This function controls the alternating class
-					$even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even';
+			// This function controls the alternating class
+			$even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even';
 
-					if ($a == "__base__") {
-						$a = elgg_echo("item:{$k}");
-						if (empty($a)) {
-							$a = $k;
-						}
-					} else {
-						$a = elgg_echo("item:{$k}:{$a}");
-						if (empty($a)) {
-							$a = "$k $a";
-						}
-					}
-					echo <<< END
-						<tr class="{$even_odd}">
-							<td class="column-one"><b>{$a}:</b></td>
-							<td>{$b}</td>
-						</tr>
-END;
+			if ($a == "__base__") {
+				$a = elgg_echo("item:{$k}");
+				if (empty($a)) {
+					$a = $k;
+				}
+			} else {
+				$a = elgg_echo("item:{$k}:{$a}");
+				if (empty($a)) {
+					$a = "$k $a";
 				}
 			}
-		?>
-		</table>
-	</div>
-</div>
-<?php
-}
-\ No newline at end of file
+			$rows .= <<< END
+				<tr class="{$even_odd}">
+					<td class="column-one"><b>{$a}:</b></td>
+					<td>{$b}</td>
+				</tr>
+END;
+		}
+	}
+
+	$title = elgg_echo('usersettings:statistics:label:numentities');
+	$content = "<table class=\"elgg-table-alt\">$rows</table>";
+
+	echo elgg_view_module('info', $title, $content);
+}
diff --git a/views/default/core/settings/statistics/online.php b/views/default/core/settings/statistics/online.php
index 65db42cb1..ce7ff35fb 100644
--- a/views/default/core/settings/statistics/online.php
+++ b/views/default/core/settings/statistics/online.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Elgg statistics screen showing online users.
+ * Statistics about this user.
  *
  * @package Elgg
  * @subpackage Core
@@ -15,17 +15,35 @@ if ($log) {
 	$logged_in = $log[0]->time_created;
 }
 
-?>
-<div class="elgg-module elgg-module-info">
-	<div class="elgg-head">
-		<h3><?php echo elgg_echo('usersettings:statistics:yourdetails'); ?></h3>
-	</div>
-	<div class="elgg-body">
-		<table class="elgg-table-alt">
-			<tr class="odd"><td class="column-one"><?php echo elgg_echo('usersettings:statistics:label:name'); ?></td><td><?php echo $user->name; ?></td></tr>
-			<tr class="even"><td class="column-one"><?php echo elgg_echo('usersettings:statistics:label:email'); ?></td><td><?php echo $user->email; ?></td></tr>
-			<tr class="odd"><td class="column-one"><?php echo elgg_echo('usersettings:statistics:label:membersince'); ?></td><td><?php echo date("r",$user->time_created); ?></td></tr>
-			<tr class="even"><td class="column-one"><?php echo elgg_echo('usersettings:statistics:label:lastlogin'); ?></td><td><?php echo date("r",$logged_in); ?></td></tr>
-		</table>
-	</div>
-</div>
-\ No newline at end of file
+$label_name = elgg_echo('usersettings:statistics:label:name');
+$label_email = elgg_echo('usersettings:statistics:label:email');
+$label_member_since = elgg_echo('usersettings:statistics:label:membersince');
+$label_last_login = elgg_echo('usersettings:statistics:label:lastlogin');
+
+$time_created = date("r", $user->time_created);
+$last_login = date("r", $logged_in);
+
+$title = elgg_echo('usersettings:statistics:yourdetails');
+
+$content = <<<__HTML
+<table class="elgg-table-alt">
+	<tr class="odd">
+		<td class="column-one">$label_name</td>
+		<td>$user->name</td>
+	</tr>
+	<tr class="even">
+		<td class="column-one">$label_email</td>
+		<td>$user->email</td>
+	</tr>
+	<tr class="odd">
+		<td class="column-one">$label_member_since</td>
+		<td>$time_created</td>
+	</tr>
+	<tr class="even">
+		<td class="column-one">$label_last_login</td>
+		<td>$last_login</td>
+	</tr>
+</table>
+__HTML;
+
+echo elgg_view_module('info', $title, $content);
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index e3205ca4e..65797172f 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -1267,7 +1267,7 @@ ul.elgg-plugin-categories, ul.elgg-plugin-categories > li {
 }
 .elgg-plugin-category-bundled {
 	border-width: 2px;
-	border-color: #DAA520;
+	border-color: #0054A7;
 }
 
 /****************************************
diff --git a/views/default/css/elements/icons.php b/views/default/css/elements/icons.php
index f7c789e33..9b12e0a57 100644
--- a/views/default/css/elements/icons.php
+++ b/views/default/css/elements/icons.php
@@ -288,8 +288,8 @@
 
 .elgg-ajax-loader {
 	background: white url(<?php echo elgg_get_site_url(); ?>_graphics/ajax_loader_bw.gif) no-repeat center center;
-	min-height: 33px;
-	min-width: 33px;
+	min-height: 31px;
+	min-width: 31px;
 }
 
 /* ***************************************
diff --git a/views/default/navigation/menu/elements/item.php b/views/default/navigation/menu/elements/item.php
index 22383ce0b..fd9738826 100644
--- a/views/default/navigation/menu/elements/item.php
+++ b/views/default/navigation/menu/elements/item.php
@@ -13,7 +13,8 @@ $item = $vars['item'];
 
 $link_class = 'elgg-menu-closed';
 if ($item->getSelected()) {
-	$item->setItemClass('elgg-state-selected');
+	// @todo switch to addItemClass when that is implemented
+	//$item->setItemClass('elgg-state-selected');
 	$link_class = 'elgg-menu-opened';
 }
 
@@ -24,6 +25,9 @@ if ($children) {
 }
 
 $item_class = $item->getItemClass();
+if ($item->getSelected()) {
+	$item_class = "$item_class elgg-state-selected";
+}
 if (isset($vars['item_class']) && $vars['item_class']) {
 	$item_class .= ' ' . $vars['item_class'];
 }
diff --git a/views/default/navigation/pagination.php b/views/default/navigation/pagination.php
index e0d355327..04044c51c 100644
--- a/views/default/navigation/pagination.php
+++ b/views/default/navigation/pagination.php
@@ -113,7 +113,12 @@ foreach ($pages->items as $page) {
 	} else {
 		$page_offset = (($page - 1) * $limit);
 		$url = elgg_http_add_url_query_elements($base_url, array($offset_key => $page_offset));
-		echo "<li><a href=\"$url\">$page</a></li>";
+		$link = elgg_view('output/url', array(
+			'href' => $url,
+			'text' => $page,
+			'is_trusted' => true,
+		));
+		echo "<li>$link</li>";
 	}
 }
 
diff --git a/views/default/object/elements/summary.php b/views/default/object/elements/summary.php
index 22db03f51..c0f3ad340 100644
--- a/views/default/object/elements/summary.php
+++ b/views/default/object/elements/summary.php
@@ -13,7 +13,7 @@
  * @uses $vars['title']     Title link (optional) false = no title, '' = default
  * @uses $vars['metadata']  HTML for entity menu and metadata (optional)
  * @uses $vars['subtitle']  HTML for the subtitle (optional)
- * @uses $vars['tags']      HTML for the tags (optional)
+ * @uses $vars['tags']      HTML for the tags (default is tags on entity, pass false for no tags)
  * @uses $vars['content']   HTML for the entity content (optional)
  */
 
@@ -39,7 +39,7 @@ $subtitle = elgg_extract('subtitle', $vars, '');
 $content = elgg_extract('content', $vars, '');
 
 $tags = elgg_extract('tags', $vars, '');
-if ($tags !== false) {
+if ($tags === '') {
 	$tags = elgg_view('output/tags', array('tags' => $entity->tags));
 }
 
diff --git a/views/default/object/widget/elements/controls.php b/views/default/object/widget/elements/controls.php
index d1d630c4f..57a935f62 100644
--- a/views/default/object/widget/elements/controls.php
+++ b/views/default/object/widget/elements/controls.php
@@ -8,9 +8,7 @@
 
 echo elgg_view_menu('widget', array(
 	'entity' => elgg_extract('widget', $vars),
-	'params' => array(
-		'show_edit' => elgg_extract('show_edit', $vars, true)
-	),
+	'show_edit' => elgg_extract('show_edit', $vars, true),
 	'sort_by' => 'priority',
 	'class' => 'elgg-menu-hz',
 ));
diff --git a/views/default/object/widget/elements/settings.php b/views/default/object/widget/elements/settings.php
index 5afe56ed8..25cda58c9 100644
--- a/views/default/object/widget/elements/settings.php
+++ b/views/default/object/widget/elements/settings.php
@@ -6,8 +6,20 @@
  */
 
 $widget = elgg_extract('widget', $vars);
+
+// not using elgg_view_form() so that we can detect if the form is empty
+$form_body = elgg_view('forms/widgets/save', $vars);
+if (!$form_body) {
+	return true;
+}
+
+$form = elgg_view('input/form', array(
+	'action' => 'action/widgets/save',
+	'body' => $form_body,
+	'class' => 'elgg-form-widgets-save',
+));
 ?>
 
 <div class="elgg-widget-edit" id="widget-edit-<?php echo $widget->guid; ?>">
-	<?php echo elgg_view_form('widgets/save', array(), $vars); ?>
+	<?php echo $form; ?>
 </div>
diff --git a/views/default/page/default.php b/views/default/page/default.php
index 892069fad..3724bffd8 100644
--- a/views/default/page/default.php
+++ b/views/default/page/default.php
@@ -14,7 +14,9 @@
 // backward compatability support for plugins that are not using the new approach
 // of routing through admin. See reportedcontent plugin for a simple example.
 if (elgg_get_context() == 'admin') {
-	elgg_deprecated_notice("admin plugins should route through 'admin'.", 1.8);
+	if (get_input('handler') != 'admin') {
+		elgg_deprecated_notice("admin plugins should route through 'admin'.", 1.8);
+	}
 	elgg_admin_add_plugin_settings_menu();
 	elgg_unregister_css('elgg');
 	echo elgg_view('page/admin', $vars);
diff --git a/views/installation/forms/install/template.php b/views/installation/forms/install/template.php
index 385168fe4..a01914f12 100644
--- a/views/installation/forms/install/template.php
+++ b/views/installation/forms/install/template.php
@@ -23,7 +23,7 @@ foreach ($variables as $field => $params) {
 }
 
 $submit_params = array(
-	'value' => elgg_echo('next'),
+	'value' => elgg_echo('install:next'),
 );
 $form_body .= elgg_view('input/submit', $submit_params);
author	Sem <sembrestels@riseup.net>	2012-07-01 23:20:47 +0200
committer	Sem <sembrestels@riseup.net>	2012-07-01 23:20:47 +0200
commit	671f9ba4e1b1972d8eaf22acfb626fa2c85af0f2 (patch)
tree	436b0de846650bce13436b51a2d5214224f8898c /views
parent	3da3f2aa28a42c23bdc9d661e7e13fd6f2bd2b10 (diff)
parent	b91d8bb0fea5cef9fafea72181a0007cfaa54725 (diff)
download	elgg-671f9ba4e1b1972d8eaf22acfb626fa2c85af0f2.tar.gz elgg-671f9ba4e1b1972d8eaf22acfb626fa2c85af0f2.tar.bz2