summaryrefslogtreecommitdiff
path: root/plugins/TinyMCE/TinyMCEPlugin.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-09-21 14:07:48 -0400
committerEvan Prodromou <evan@status.net>2010-09-21 14:07:48 -0400
commit78ed0348b0eaaebf7a51d55adc7e746cc5b43bbf (patch)
tree26545c5badcfcf54956f67d813c97b2f3eb3c84e /plugins/TinyMCE/TinyMCEPlugin.php
parentdffec9f223c1e45832d274c34f7bd6624cbf87ea (diff)
parentd342899677d208d7e300b29ad3a8d053e4c6f704 (diff)
Merge remote branch 'gitorious/0.9.x' into 0.9.x
Diffstat (limited to 'plugins/TinyMCE/TinyMCEPlugin.php')
-rw-r--r--plugins/TinyMCE/TinyMCEPlugin.php10
1 files changed, 4 insertions, 6 deletions
diff --git a/plugins/TinyMCE/TinyMCEPlugin.php b/plugins/TinyMCE/TinyMCEPlugin.php
index ca16f6059..2ec4b7160 100644
--- a/plugins/TinyMCE/TinyMCEPlugin.php
+++ b/plugins/TinyMCE/TinyMCEPlugin.php
@@ -48,7 +48,6 @@ if (!defined('STATUSNET')) {
*/
class TinyMCEPlugin extends Plugin
{
-
var $html;
function onEndShowScripts($action)
@@ -74,7 +73,7 @@ class TinyMCEPlugin extends Plugin
'author' => 'Evan Prodromou',
'homepage' => 'http://status.net/wiki/Plugin:TinyMCE',
'rawdescription' =>
- _m('Use TinyMCE library to allow rich text editing in the browser'));
+ _m('Use TinyMCE library to allow rich text editing in the browser.'));
return true;
}
@@ -108,7 +107,7 @@ class TinyMCEPlugin extends Plugin
/**
* Hook for new-notice form processing to take our HTML goodies;
* won't affect API posting etc.
- *
+ *
* @param NewNoticeAction $action
* @param User $user
* @param string $content
@@ -159,9 +158,9 @@ class TinyMCEPlugin extends Plugin
/**
* Format the attachment placeholder img with the final version.
- *
+ *
* @param DOMElement $img
- * @param MediaFile $media
+ * @param MediaFile $media
*/
private function formatAttachment($img, $media)
{
@@ -321,5 +320,4 @@ END_OF_SCRIPT;
return $scr;
}
-
}