summaryrefslogtreecommitdiff
path: root/modules/notification
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2009-08-30 16:20:52 -0700
committerBharat Mediratta <bharat@menalto.com>2009-08-30 16:20:52 -0700
commit7015948357f91e79bb10595cd7c6bc2513d0863e (patch)
treed272757f1dc1e38426eeea80399b6313ea247adc /modules/notification
parent74e204b557618520d7bc56266a25d230946f02e7 (diff)
parente4eedadcbb42e831f9649e6b52bd1ee9bf86f544 (diff)
Merge branch 'master' of git@github.com:/gallery/gallery3
Diffstat (limited to 'modules/notification')
-rw-r--r--modules/notification/views/comment_published.html.php12
-rw-r--r--modules/notification/views/item_added.html.php8
-rw-r--r--modules/notification/views/item_deleted.html.php6
-rw-r--r--modules/notification/views/item_updated.html.php12
4 files changed, 19 insertions, 19 deletions
diff --git a/modules/notification/views/comment_published.html.php b/modules/notification/views/comment_published.html.php
index 4a56cdad..e39e39c6 100644
--- a/modules/notification/views/comment_published.html.php
+++ b/modules/notification/views/comment_published.html.php
@@ -1,26 +1,26 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<html>
<head>
- <title><?= p::clean($subject) ?> </title>
+ <title><?= html::clean($subject) ?> </title>
</head>
<body>
- <h2><?= p::clean($subject) ?></h2>
+ <h2><?= html::clean($subject) ?></h2>
<table>
<tr>
<td><?= t("Comment:") ?></td>
- <td><?= nl2br(p::purify($comment->text)) ?></td>
+ <td><?= nl2br(html::purify($comment->text)) ?></td>
</tr>
<tr>
<td><?= t("Author Name:") ?></td>
- <td><?= p::clean($comment->author_name()) ?></td>
+ <td><?= html::clean($comment->author_name()) ?></td>
</tr>
<tr>
<td><?= t("Author Email:") ?></td>
- <td><?= p::clean($comment->author_email()) ?></td>
+ <td><?= html::clean($comment->author_email()) ?></td>
</tr>
<tr>
<td><?= t("Author URL:") ?></td>
- <td><?= p::clean($comment->author_url()) ?></td>
+ <td><?= html::clean($comment->author_url()) ?></td>
</tr>
<tr>
<td><?= t("Url:") ?></td>
diff --git a/modules/notification/views/item_added.html.php b/modules/notification/views/item_added.html.php
index 86724927..f697fea6 100644
--- a/modules/notification/views/item_added.html.php
+++ b/modules/notification/views/item_added.html.php
@@ -1,14 +1,14 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<html>
<head>
- <title><?= p::clean($subject) ?> </title>
+ <title><?= html::clean($subject) ?> </title>
</head>
<body>
- <h2><?= p::clean($subject) ?></h2>
+ <h2><?= html::clean($subject) ?></h2>
<table>
<tr>
<td><?= t("Title:") ?></td>
- <td><?= p::purify($item->title) ?></td>
+ <td><?= html::purify($item->title) ?></td>
</tr>
<tr>
<td><?= t("Url:") ?></td>
@@ -21,7 +21,7 @@
<? if ($item->description): ?>
<tr>
<td><?= t("Description:") ?></td>
- <td><?= nl2br(p::purify($item->description)) ?></td>
+ <td><?= nl2br(html::purify($item->description)) ?></td>
</tr>
<? endif ?>
</table>
diff --git a/modules/notification/views/item_deleted.html.php b/modules/notification/views/item_deleted.html.php
index 92215211..a51782ff 100644
--- a/modules/notification/views/item_deleted.html.php
+++ b/modules/notification/views/item_deleted.html.php
@@ -1,15 +1,15 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<html>
<head>
- <title><?= p::clean($subject) ?> </title>
+ <title><?= html::clean($subject) ?> </title>
</head>
<body>
- <h2><?= p::clean($subject) ?></h2>
+ <h2><?= html::clean($subject) ?></h2>
<table>
<tr>
<td colspan="2">
<?= t("To view the changed album %title use the link below.",
- array("title" => p::purify($item->parent()->title))) ?>
+ array("title" => html::purify($item->parent()->title))) ?>
</td>
</tr>
<tr>
diff --git a/modules/notification/views/item_updated.html.php b/modules/notification/views/item_updated.html.php
index 39f9113b..ba03540a 100644
--- a/modules/notification/views/item_updated.html.php
+++ b/modules/notification/views/item_updated.html.php
@@ -1,18 +1,18 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<html>
<head>
- <title><?= p::clean($subject) ?> </title>
+ <title><?= html::clean($subject) ?> </title>
</head>
<body>
- <h2> <?= p::clean($subject) ?> </h2>
+ <h2> <?= html::clean($subject) ?> </h2>
<table>
<tr>
<? if ($item->original("title") != $item->title): ?>
<td><?= t("New Title:") ?></td>
- <td><?= p::clean($item->title) ?></td>
+ <td><?= html::clean($item->title) ?></td>
<? else: ?>
<td><?= t("Title:") ?></td>
- <td><?= p::clean($item->title) ?></td>
+ <td><?= html::clean($item->title) ?></td>
<? endif ?>
</tr>
<tr>
@@ -22,12 +22,12 @@
<? if ($item->original("description") != $item->description): ?>
<tr>
<td><?= t("New Description:") ?></td>
- <td><?= p::clean($item->description) ?></td>
+ <td><?= html::clean($item->description) ?></td>
</tr>
<? elseif (!empty($item->description)): ?>
<tr>
<td><?= t("Description:") ?></td>
- <td><?= p::clean($item->description) ?></td>
+ <td><?= html::clean($item->description) ?></td>
</tr>
<? endif ?>
</table>