more deprecate $a

2 files changed, 4 insertions, 5 deletions

diff --git a/include/conversation.php b/include/conversation.php
index 5e63c4199..f8d5f7ec0 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1306,11 +1306,11 @@ function format_like($cnt, $arr, $type, $id) {
 /**
  * Wrapper to allow addons to replace the status editor if desired.
  */
-function status_editor($a, $x, $popup = false, $module='') {
+function status_editor($x, $popup = false, $module='') {
 	$hook_info = ['editor_html' => '', 'x' => $x, 'popup' => $popup, 'module' => $module];
 	call_hooks('status_editor',$hook_info);
 	if ($hook_info['editor_html'] == '') {
-		return hz_status_editor($a, $x, $popup);
+		return hz_status_editor($x, $popup);
 	} else {
 		return $hook_info['editor_html'];
 	}
@@ -1322,7 +1322,7 @@ function status_editor($a, $x, $popup = false, $module='') {
  * They are referring to the content editor or components thereof.
  */
 
-function hz_status_editor($a, $x, $popup = false) {
+function hz_status_editor($x, $popup = false) {
 
 	$o = '';
 
diff --git a/include/text.php b/include/text.php
index 6ab8fc1ce..4088e85e1 100644
--- a/include/text.php
+++ b/include/text.php
@@ -528,9 +528,8 @@ function unxmlify($s) {
  * will limit the results to the correct items for the current page.
  * The actual page handling is then accomplished at the application layer.
  *
- * @param App &$a
  */
-function paginate(&$a) {
+function paginate() {
 	$o = '';
 	$stripped = preg_replace('/(&page=[0-9]*)/','',App::$query_string);