From b1cdc5a93273f7536cb1a3c9870214f6d0aaaed0 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Mon, 27 Feb 2012 09:08:48 -0500 Subject: [PATCH 1/2] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: fixed syntax errors add plugin hooks to enotify * master: From 9c698b1a60024a83982534ecf16409d03ff1e813 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Fri, 2 Mar 2012 12:00:16 -0500 Subject: [PATCH 2/2] fix for comment-wwedit-wrapper CSS class in tpl had a stray $ Signed-off-by: Simon L'nu --- images/icons/lock.png.tmp | Bin 8213 -> 0 bytes view/comment_item.tpl | 2 +- view/theme/duepuntozero/comment_item.tpl | 2 +- view/theme/loozah/comment_item.tpl | 2 +- view/theme/testbubble/comment_item.tpl | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) delete mode 100755 images/icons/lock.png.tmp diff --git a/images/icons/lock.png.tmp b/images/icons/lock.png.tmp deleted file mode 100755 index 7e58ead2eb90f10dce17673c15b2eaaaf702e62f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8213 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 diff --git a/view/comment_item.tpl b/view/comment_item.tpl index c992593f8..cde4ca3ca 100755 --- a/view/comment_item.tpl +++ b/view/comment_item.tpl @@ -1,4 +1,4 @@ -
+
diff --git a/view/theme/duepuntozero/comment_item.tpl b/view/theme/duepuntozero/comment_item.tpl index b29735227..3503c3843 100755 --- a/view/theme/duepuntozero/comment_item.tpl +++ b/view/theme/duepuntozero/comment_item.tpl @@ -1,4 +1,4 @@ -
+
diff --git a/view/theme/loozah/comment_item.tpl b/view/theme/loozah/comment_item.tpl index b29735227..3503c3843 100755 --- a/view/theme/loozah/comment_item.tpl +++ b/view/theme/loozah/comment_item.tpl @@ -1,4 +1,4 @@ -
+
diff --git a/view/theme/testbubble/comment_item.tpl b/view/theme/testbubble/comment_item.tpl index bc75eb1a6..4754a1eb7 100755 --- a/view/theme/testbubble/comment_item.tpl +++ b/view/theme/testbubble/comment_item.tpl @@ -1,4 +1,4 @@ -
+