diff options
Diffstat (limited to 'views/default')
-rw-r--r-- | views/default/admin/main.php | 4 | ||||
-rw-r--r-- | views/default/admin/plugins.php | 2 | ||||
-rw-r--r-- | views/default/admin/site.php | 2 | ||||
-rw-r--r-- | views/default/admin/user.php | 2 | ||||
-rw-r--r-- | views/default/canvas/layouts/widgets.php | 2 | ||||
-rw-r--r-- | views/default/messages/errors/error.php | 2 | ||||
-rw-r--r-- | views/default/messages/exceptions/exception.php | 4 | ||||
-rw-r--r-- | views/default/messages/messages/message.php | 2 | ||||
-rw-r--r-- | views/default/usersettings/main.php | 2 | ||||
-rw-r--r-- | views/default/usersettings/plugins.php | 2 |
10 files changed, 12 insertions, 12 deletions
diff --git a/views/default/admin/main.php b/views/default/admin/main.php index df1b32cde..e1ed8c25f 100644 --- a/views/default/admin/main.php +++ b/views/default/admin/main.php @@ -11,8 +11,8 @@ * @link http://elgg.org/
*/
- // Description of what's going on
- echo "<p>" . autop(elgg_echo("admin:description")) . "</p>";
+ // Description of what's going on
+ echo "<p>" . elgg_view('output/longtext', array('value' => elgg_echo("admin:description"))) . "</p>";
diff --git a/views/default/admin/plugins.php b/views/default/admin/plugins.php index 17ab86eae..9e14eaa2e 100644 --- a/views/default/admin/plugins.php +++ b/views/default/admin/plugins.php @@ -18,7 +18,7 @@ // Description of what's going on $buttons = " <a class='enableallplugins' href=\"{$CONFIG->url}action/admin/plugins/enableall?__elgg_token=$token&__elgg_ts=$ts\">".elgg_echo('enableall')."</a> <a class='disableallplugins' href=\"{$CONFIG->url}action/admin/plugins/disableall?__elgg_token=$token&__elgg_ts=$ts\">".elgg_echo('disableall')."</a> "; - echo "<div class=\"contentWrapper\"><span class=\"contentIntro\">" . $buttons . autop(elgg_echo("admin:plugins:description")) . "<div class='clearfloat'></div></span></div>"; + echo "<div class=\"contentWrapper\"><span class=\"contentIntro\">" . $buttons . elgg_view('output/longtext', array('value' => elgg_echo("admin:plugins:description"))) . "<div class='clearfloat'></div></span></div>"; $limit = get_input('limit', 10); $offset = get_input('offset', 0); diff --git a/views/default/admin/site.php b/views/default/admin/site.php index 020b72b59..a1acae53a 100644 --- a/views/default/admin/site.php +++ b/views/default/admin/site.php @@ -14,7 +14,7 @@ global $CONFIG; // Description of what's going on - echo "<div class=\"contentWrapper\">" . autop(elgg_echo("admin:site:description")) . " "; + echo "<div class=\"contentWrapper\">" . elgg_view('output/longtext', array('value' => elgg_echo("admin:site:description"))) . " "; echo elgg_view("settings/system",array("action" => $CONFIG->wwwroot."action/admin/site/update_basic")); // Always want to do this first. diff --git a/views/default/admin/user.php b/views/default/admin/user.php index a648789aa..117656fa0 100644 --- a/views/default/admin/user.php +++ b/views/default/admin/user.php @@ -12,7 +12,7 @@ */ // Description of what's going on - echo "<div class=\"contentWrapper\"><span class=\"contentIntro\">" . autop(elgg_echo("admin:user:description")) . "</span></div>"; + echo "<div class=\"contentWrapper\"><span class=\"contentIntro\">" . elgg_view('output/longtext', array('value' => elgg_echo("admin:user:description"))) . "</span></div>"; echo elgg_view("admin/user_opt/adduser"); diff --git a/views/default/canvas/layouts/widgets.php b/views/default/canvas/layouts/widgets.php index 476da9857..8b7789851 100644 --- a/views/default/canvas/layouts/widgets.php +++ b/views/default/canvas/layouts/widgets.php @@ -72,7 +72,7 @@ <div class="customise_editpanel_instructions"> <h2><?php echo elgg_echo('widgets:add'); ?></h2> -<?php echo autop(elgg_echo('widgets:add:description')); ?> +<?php echo elgg_view('output/longtext', array('value' => elgg_echo('widgets:add:description'))); ?> </div> diff --git a/views/default/messages/errors/error.php b/views/default/messages/errors/error.php index 63caae81e..71289bdf4 100644 --- a/views/default/messages/errors/error.php +++ b/views/default/messages/errors/error.php @@ -16,5 +16,5 @@ ?>
<p>
- <?php echo autop($vars['object']); ?>
+ <?php echo elgg_view('output/longtext', array('value' => $vars['object'])); ?>
</p>
\ No newline at end of file diff --git a/views/default/messages/exceptions/exception.php b/views/default/messages/exceptions/exception.php index 5d1faac81..f3668e3e6 100644 --- a/views/default/messages/exceptions/exception.php +++ b/views/default/messages/exceptions/exception.php @@ -17,7 +17,7 @@ global $CONFIG; $class = get_class($vars['object']); - $message = autop($vars['object']->getMessage()); + $message = elgg_view('output/longtext', array('value' => $vars['object']->getMessage())); $body = <<< END <p class="messages-exception"> @@ -29,7 +29,7 @@ END; if ($CONFIG->debug) { - $details = autop(htmlentities(print_r($vars['object'], true), ENT_QUOTES, 'UTF-8')); + $details = elgg_view('output/longtext', array('value' => htmlentities(print_r($vars['object'], true), ENT_QUOTES, 'UTF-8'))); $body .= <<< END <hr /> <p class="messages-exception-detail"> diff --git a/views/default/messages/messages/message.php b/views/default/messages/messages/message.php index 285d4bedd..27771e4ef 100644 --- a/views/default/messages/messages/message.php +++ b/views/default/messages/messages/message.php @@ -16,5 +16,5 @@ ?>
<p>
- <?php echo autop($vars['object']); ?>
+ <?php echo elgg_view('output/longtext', array('value' => $vars['object'])); ?>
</p>
\ No newline at end of file diff --git a/views/default/usersettings/main.php b/views/default/usersettings/main.php index 4a814c083..39ef5486e 100644 --- a/views/default/usersettings/main.php +++ b/views/default/usersettings/main.php @@ -12,5 +12,5 @@ */ // Description of what's going on - echo "<p>" . autop(elgg_echo("usersettings:description")) . "</p>"; + echo "<p>" . elgg_view('output/longtext', array('value' => elgg_echo("usersettings:description"))) . "</p>"; ?>
\ No newline at end of file diff --git a/views/default/usersettings/plugins.php b/views/default/usersettings/plugins.php index 6573766f7..c18c5aaef 100644 --- a/views/default/usersettings/plugins.php +++ b/views/default/usersettings/plugins.php @@ -11,7 +11,7 @@ */ // Description of what's going on - echo "<div class=\"contentWrapper\">" . autop(elgg_echo("usersettings:plugins:description")) . "</div>"; + echo "<div class=\"contentWrapper\">" . elgg_view('output/longtext', array('value' => elgg_echo("usersettings:plugins:description"))) . "</div>"; $limit = get_input('limit', 10); $offset = get_input('offset', 0); |