diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2010-01-16 00:15:23 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2010-01-16 00:15:23 -0800 |
| commit | 434d351b2f0fc2a048f561665cb1d828d1126f9c (patch) | |
| tree | 12b23d33fecf0e5b053a79ed1bf3b8a604c98372 /modules/notification/views | |
| parent | 654b103355f1bda15246e651fa91f3c9e08c3901 (diff) | |
| parent | dcf4b5e71ae8a097f133a06485d60c5fb3400824 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev
Conflicts:
modules/gallery/models/item.php
Diffstat (limited to 'modules/notification/views')
| -rw-r--r-- | modules/notification/views/item_updated.html.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/notification/views/item_updated.html.php b/modules/notification/views/item_updated.html.php index 47856cab..7020fd53 100644 --- a/modules/notification/views/item_updated.html.php +++ b/modules/notification/views/item_updated.html.php @@ -7,7 +7,7 @@ <h2> <?= html::clean($subject) ?> </h2> <table> <tr> - <? if ($item->original("title") != $item->title): ?> + <? if ($original->title != $item->title): ?> <td><?= t("New title:") ?></td> <td><?= html::clean($item->title) ?></td> <? else: ?> @@ -19,7 +19,7 @@ <td><?= t("Url:") ?></td> <td><a href="<?= $item->abs_url() ?>"><?= $item->abs_url() ?></a></td> </tr> - <? if ($item->original("description") != $item->description): ?> + <? if ($original->description != $item->description): ?> <tr> <td><?= t("New description:") ?></td> <td><?= html::clean($item->description) ?></td> |