From fffc9698e85ca4cc86c8d1d84169291bc4812cd9 Mon Sep 17 00:00:00 2001 From: Denys Nosov Date: Mon, 1 May 2017 12:51:45 +0300 Subject: [PATCH 1/2] Parameters number mismatch declaretion ($table->delete() not use parameters) --- plugins/cck_storage_location/joomla_user/joomla_user.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/cck_storage_location/joomla_user/joomla_user.php b/plugins/cck_storage_location/joomla_user/joomla_user.php index d0c09f134..ea9b1d389 100644 --- a/plugins/cck_storage_location/joomla_user/joomla_user.php +++ b/plugins/cck_storage_location/joomla_user/joomla_user.php @@ -289,7 +289,7 @@ public static function onCCK_Storage_LocationDelete( $pk, &$config = array() ) if ( in_array( false, $result, true ) ) { return false; } - if ( !$table->delete( $pk ) ) { + if ( !$table->delete() ) { return false; } $dispatcher->trigger( 'onUserAfterDelete', array( $table->getProperties(), true, $table->getError() ) ); From 855b004d5d3c45636cf0f9871356a4beace262a3 Mon Sep 17 00:00:00 2001 From: Denys Nosov Date: Mon, 1 May 2017 13:25:45 +0300 Subject: [PATCH 2/2] Inconsistent return points --- administrator/components/com_cck/controller.php | 2 +- administrator/components/com_cck/controllers/box.php | 2 ++ administrator/components/com_cck/controllers/field.php | 4 ++++ administrator/components/com_cck/controllers/form.php | 2 ++ administrator/components/com_cck/controllers/search.php | 4 ++++ administrator/components/com_cck/controllers/site.php | 2 ++ administrator/components/com_cck/controllers/template.php | 2 ++ administrator/components/com_cck/controllers/type.php | 4 ++++ administrator/components/com_cck/models/search.php | 2 ++ administrator/components/com_cck/tables/folder.php | 2 ++ .../components/com_cck/views/field/view.html.php | 2 ++ administrator/components/com_cck/views/field/view.raw.php | 2 ++ .../components/com_cck/views/folder/view.html.php | 2 ++ .../components/com_cck/views/search/view.html.php | 2 ++ .../components/com_cck/views/search/view.raw.php | 2 ++ .../components/com_cck/views/session/view.html.php | 4 +++- administrator/components/com_cck/views/site/view.html.php | 2 ++ .../components/com_cck/views/template/view.html.php | 2 ++ administrator/components/com_cck/views/type/view.html.php | 2 ++ administrator/components/com_cck/views/type/view.raw.php | 2 ++ .../components/com_cck/views/version/view.html.php | 2 ++ components/com_cck/controller.php | 4 +++- components/com_cck/controllers/box.php | 2 ++ libraries/cck/base/install/export.php | 2 ++ .../cck/development/plugins/plg_cck_field/%name%.php | 6 +++++- .../plugins/plg_cck_storage_location/%name%.php | 4 ++-- libraries/cck/joomla/access/rules.php | 2 ++ .../cck/joomla/application/component/controllerform.php | 2 ++ libraries/cck/rendering/document/document.php | 6 ++++++ libraries/cck/rendering/document/html/html.php | 2 ++ .../cck/rendering/document/html/renderer/component.php | 1 + libraries/cck/rendering/document/html/renderer/head.php | 2 ++ .../cck/rendering/document/html/renderer/message.php | 1 + libraries/cck/rendering/document/html/renderer/module.php | 1 + .../cck/rendering/document/html/renderer/modules.php | 1 + libraries/cck/rendering/document/renderer.php | 1 + libraries/cck/rendering/rendering.php | 6 ++++++ libraries/cck/rendering/rendering_item.php | 4 ++++ libraries/cms/cck/base/legacy/view/list.php | 2 +- libraries/cms/cck/cck.php | 2 +- libraries/cms/cck/content.php | 2 ++ libraries/cms/cck/dev/image.php | 2 ++ libraries/cms/cck/ecommerce.php | 2 +- libraries/cms/cck/field.php | 4 ++++ libraries/cms/cck/legacy.php | 2 ++ libraries/cms/cck/table/batch.php | 4 ++++ libraries/cms/cck/webservice.php | 2 ++ plugins/cck_field/42/42.php | 6 +++++- plugins/cck_field/button_free/button_free.php | 4 ++++ plugins/cck_field/button_submit/button_submit.php | 4 ++++ plugins/cck_field/calendar/calendar.php | 6 +++++- plugins/cck_field/checkbox/checkbox.php | 6 +++++- plugins/cck_field/colorpicker/colorpicker.php | 6 +++++- plugins/cck_field/div/div.php | 4 ++++ plugins/cck_field/email/email.php | 6 +++++- plugins/cck_field/field_x/field_x.php | 4 ++++ plugins/cck_field/freetext/freetext.php | 4 ++++ plugins/cck_field/group/group.php | 2 ++ plugins/cck_field/group_x/group_x.php | 2 ++ plugins/cck_field/hidden/hidden.php | 6 +++++- plugins/cck_field/jform_accesslevel/jform_accesslevel.php | 6 +++++- .../cck_field/jform_associations/jform_associations.php | 6 +++++- plugins/cck_field/jform_category/jform_category.php | 6 +++++- .../jform_componentlayout/jform_componentlayout.php | 6 +++++- .../jform_contentlanguage/jform_contentlanguage.php | 6 +++++- plugins/cck_field/jform_editors/jform_editors.php | 6 +++++- plugins/cck_field/jform_groupparent/jform_groupparent.php | 6 +++++- plugins/cck_field/jform_helpsite/jform_helpsite.php | 6 +++++- plugins/cck_field/jform_media/jform_media.php | 6 +++++- plugins/cck_field/jform_menuitem/jform_menuitem.php | 6 +++++- plugins/cck_field/jform_rules/jform_rules.php | 6 +++++- plugins/cck_field/jform_tag/jform_tag.php | 6 +++++- .../cck_field/jform_templatestyle/jform_templatestyle.php | 6 +++++- plugins/cck_field/jform_timezone/jform_timezone.php | 6 +++++- plugins/cck_field/jform_user/jform_user.php | 6 +++++- plugins/cck_field/jform_usergroups/jform_usergroups.php | 6 +++++- plugins/cck_field/joomla_module/joomla_module.php | 2 ++ plugins/cck_field/link/link.php | 6 +++++- plugins/cck_field/password/password.php | 6 +++++- plugins/cck_field/radio/radio.php | 6 +++++- plugins/cck_field/search_generic/search_generic.php | 6 +++++- plugins/cck_field/search_ordering/search_ordering.php | 6 +++++- plugins/cck_field/select_dynamic/select_dynamic.php | 6 +++++- plugins/cck_field/select_multiple/select_multiple.php | 6 +++++- plugins/cck_field/select_numeric/select_numeric.php | 6 +++++- plugins/cck_field/select_simple/select_simple.php | 6 +++++- plugins/cck_field/storage/storage.php | 2 ++ plugins/cck_field/tabs/tabs.php | 4 ++++ plugins/cck_field/text/text.php | 6 +++++- plugins/cck_field/textarea/textarea.php | 6 +++++- plugins/cck_field/upload_file/upload_file.php | 6 +++++- plugins/cck_field/upload_image/upload_image.php | 8 +++++++- plugins/cck_field/wysiwyg_editor/wysiwyg_editor.php | 6 +++++- plugins/cck_field_typo/image/image.php | 4 ++++ .../joomla_article/classes/importer.php | 2 ++ .../joomla_article/joomla_article.php | 4 ++++ .../joomla_category/joomla_category.php | 6 ++++++ plugins/cck_storage_location/joomla_user/joomla_user.php | 4 +++- .../joomla_user_group/joomla_user_group.php | 2 +- plugins/content/cck/cck.php | 2 ++ plugins/user/cck/cck.php | 2 ++ 101 files changed, 348 insertions(+), 47 deletions(-) diff --git a/administrator/components/com_cck/controller.php b/administrator/components/com_cck/controller.php index 7a708c447..7f246f26f 100644 --- a/administrator/components/com_cck/controller.php +++ b/administrator/components/com_cck/controller.php @@ -268,7 +268,7 @@ public function ajax_field_li( $field = NULL, $client = '' ) if ( $return !== false ) { return JCckDev::toJSON( $json ); } - echo JCckDev::toJSON( $json ); + return JCckDev::toJSON( $json ); } // ajax_session diff --git a/administrator/components/com_cck/controllers/box.php b/administrator/components/com_cck/controllers/box.php index 3ae109b27..0f93b86f9 100644 --- a/administrator/components/com_cck/controllers/box.php +++ b/administrator/components/com_cck/controllers/box.php @@ -44,6 +44,8 @@ public function add() $app->setUserState( CCK_COM.'.add.box.bx.name', $app->input->get( 'name', '' ) ); $app->setUserState( CCK_COM.'.add.box.bx.type', $app->input->getString( 'type', '' ) ); $app->setUserState( CCK_COM.'.add.box.bx.params', $app->input->getString( 'params', '' ) ); + + return true; } } ?> \ No newline at end of file diff --git a/administrator/components/com_cck/controllers/field.php b/administrator/components/com_cck/controllers/field.php index 610a4298d..67794f594 100644 --- a/administrator/components/com_cck/controllers/field.php +++ b/administrator/components/com_cck/controllers/field.php @@ -74,6 +74,8 @@ public function add() // Additional Vars $app->setUserState( CCK_COM.'.add.field.ajax_state', $app->input->getInt( 'ajax_state' ) ); $app->setUserState( CCK_COM.'.edit.field.ajax_type', $app->input->getString( 'ajax_type', '' ) ); + + return true; } // edit @@ -89,6 +91,8 @@ public function edit( $key = null, $urlVar = null ) // Additional Vars $app->setUserState( CCK_COM.'.edit.field.ajax_type', $app->input->getString( 'ajax_type', '' ) ); + + return true; } // cancel diff --git a/administrator/components/com_cck/controllers/form.php b/administrator/components/com_cck/controllers/form.php index 1a037f6b1..87fbf94e2 100644 --- a/administrator/components/com_cck/controllers/form.php +++ b/administrator/components/com_cck/controllers/form.php @@ -118,6 +118,8 @@ public function save( $key = null, $urlVar = null, $isAjax = false ) } $this->setRedirect( htmlspecialchars_decode( $link ), $msg, $msgType ); + + return true; } // cancel diff --git a/administrator/components/com_cck/controllers/search.php b/administrator/components/com_cck/controllers/search.php index 9d81cecee..78df2065c 100644 --- a/administrator/components/com_cck/controllers/search.php +++ b/administrator/components/com_cck/controllers/search.php @@ -79,6 +79,8 @@ public function add() $app->setUserState( CCK_COM.'.add.search.tpl_list', $app->input->getString( 'tpl_l', '' ) ); $app->setUserState( CCK_COM.'.add.search.tpl_item', $app->input->getString( 'tpl_i', '' ) ); $app->setUserState( CCK_COM.'.add.search.skip', $app->input->getString( 'skip', '' ) ); + + return true; } // edit @@ -94,6 +96,8 @@ public function edit( $key = null, $urlVar = null ) // Additional Vars $app->setUserState( CCK_COM.'.edit.search.client', $app->input->getString( 'client', '' ) ); + + return true; } // postSaveHook diff --git a/administrator/components/com_cck/controllers/site.php b/administrator/components/com_cck/controllers/site.php index c083b82fb..63e8bd991 100644 --- a/administrator/components/com_cck/controllers/site.php +++ b/administrator/components/com_cck/controllers/site.php @@ -30,6 +30,8 @@ public function add() // Additional Vars $app->setUserState( CCK_COM.'.edit.site.type', $app->input->getString( 'type', '' ) ); + + return true; } // postSaveHook diff --git a/administrator/components/com_cck/controllers/template.php b/administrator/components/com_cck/controllers/template.php index fd2437bc1..374e7e456 100644 --- a/administrator/components/com_cck/controllers/template.php +++ b/administrator/components/com_cck/controllers/template.php @@ -73,6 +73,8 @@ public function add() // Additional Vars $app->setUserState( CCK_COM.'.edit.template.mode', $app->input->getString( 'mode', '' ) ); + + return true; } // export_variation diff --git a/administrator/components/com_cck/controllers/type.php b/administrator/components/com_cck/controllers/type.php index e92b0735e..a2f421548 100644 --- a/administrator/components/com_cck/controllers/type.php +++ b/administrator/components/com_cck/controllers/type.php @@ -77,6 +77,8 @@ public function add() $app->setUserState( CCK_COM.'.add.type.tpl_site', $app->input->getString( 'tpl_s', '' ) ); $app->setUserState( CCK_COM.'.add.type.tpl_content', $app->input->getString( 'tpl_c', '' ) ); $app->setUserState( CCK_COM.'.add.type.tpl_intro', $app->input->getString( 'tpl_i', '' ) ); + + return true; } // edit @@ -92,6 +94,8 @@ public function edit( $key = null, $urlVar = null ) // Additional Vars $app->setUserState( CCK_COM.'.edit.type.client', $app->input->getString( 'client', '' ) ); + + return true; } // postSaveHook diff --git a/administrator/components/com_cck/models/search.php b/administrator/components/com_cck/models/search.php index fd2887056..5501626d6 100644 --- a/administrator/components/com_cck/models/search.php +++ b/administrator/components/com_cck/models/search.php @@ -339,6 +339,8 @@ public function duplicate( $pk ) // Positions $string = $this->_table_no_key_batch( 'where', 'searchid = '.(int)$pk, '#__cck_core_search_position', 'searchid', $table->id ); } + + return true; } // version diff --git a/administrator/components/com_cck/tables/folder.php b/administrator/components/com_cck/tables/folder.php index d6453d759..99c0f6e93 100644 --- a/administrator/components/com_cck/tables/folder.php +++ b/administrator/components/com_cck/tables/folder.php @@ -126,6 +126,8 @@ public function delete( $pk = null ) return parent::delete(); } } + + return true; } } ?> \ No newline at end of file diff --git a/administrator/components/com_cck/views/field/view.html.php b/administrator/components/com_cck/views/field/view.html.php index 36e99f52e..969d82b20 100644 --- a/administrator/components/com_cck/views/field/view.html.php +++ b/administrator/components/com_cck/views/field/view.html.php @@ -39,6 +39,8 @@ function prepareDisplay() $this->insidebox = Helper_Admin::addInsidebox( $this->isNew ); Helper_Admin::addToolbarEdit( $this->vName, _C3_TEXT, array( 'isNew'=>$this->isNew, 'folder'=>$this->state->get( 'filter.folder' ), 'checked_out'=>$this->item->checked_out ) ); + + return true; } } ?> \ No newline at end of file diff --git a/administrator/components/com_cck/views/field/view.raw.php b/administrator/components/com_cck/views/field/view.raw.php index b9f0c62b6..cc85bbc47 100644 --- a/administrator/components/com_cck/views/field/view.raw.php +++ b/administrator/components/com_cck/views/field/view.raw.php @@ -38,6 +38,8 @@ function prepareDisplay() $this->item->type = Helper_Admin::getSelected( $this->vName, 'type', $app->input->getString( 'ajax_type', $this->state->get( 'ajax.type', $this->item->type ) ), 'text' ); Helper_Admin::addToolbarEdit( $this->vName, _C3_TEXT, array( 'isNew'=>$this->isNew, 'folder'=>$this->state->get( 'filter.folder' ), 'checked_out'=>$this->item->checked_out ) ); + + return true; } } ?> \ No newline at end of file diff --git a/administrator/components/com_cck/views/folder/view.html.php b/administrator/components/com_cck/views/folder/view.html.php index 28c44819c..47c6c3ee1 100644 --- a/administrator/components/com_cck/views/folder/view.html.php +++ b/administrator/components/com_cck/views/folder/view.html.php @@ -37,6 +37,8 @@ function prepareDisplay() $this->insidebox = Helper_Admin::addInsidebox( $this->isNew ); Helper_Admin::addToolbarEdit( $this->vName, 'COM_CCK_'._C0_TEXT, array( 'isNew'=>$this->isNew, 'folder'=>$this->state->get( 'filter.folder' ), 'checked_out'=>$this->item->checked_out ) ); + + return true; } // prepareDelete diff --git a/administrator/components/com_cck/views/search/view.html.php b/administrator/components/com_cck/views/search/view.html.php index 96fb4592b..6e071a30b 100644 --- a/administrator/components/com_cck/views/search/view.html.php +++ b/administrator/components/com_cck/views/search/view.html.php @@ -143,6 +143,8 @@ function prepareDisplay() $this->insidebox = Helper_Admin::addInsidebox( $this->isNew ); Helper_Admin::addToolbarEdit( $this->vName, 'COM_CCK_'._C4_TEXT, array( 'isNew'=>$this->isNew, 'folder'=>$this->state->get( 'filter.folder' ), 'checked_out'=>$this->item->checked_out ), array( 'template' => $this->item->template ) ); + + return true; } } ?> \ No newline at end of file diff --git a/administrator/components/com_cck/views/search/view.raw.php b/administrator/components/com_cck/views/search/view.raw.php index 72ac9625c..c944dc9f6 100644 --- a/administrator/components/com_cck/views/search/view.raw.php +++ b/administrator/components/com_cck/views/search/view.raw.php @@ -120,6 +120,8 @@ function prepareDisplay() $this->item->template = ( isset( $this->style->template ) ) ? $this->style->template : ''; Helper_Admin::addToolbarEdit( $this->vName, 'COM_CCK_'._C4_TEXT, array( 'isNew'=>$this->isNew, 'folder'=>$this->state->get( 'filter.folder' ), 'checked_out'=>$this->item->checked_out ), array( 'template' => $this->item->template ) ); + + return true; } // prepareDisplay_Ajax diff --git a/administrator/components/com_cck/views/session/view.html.php b/administrator/components/com_cck/views/session/view.html.php index ed74fdbfc..90fe5ec93 100644 --- a/administrator/components/com_cck/views/session/view.html.php +++ b/administrator/components/com_cck/views/session/view.html.php @@ -10,7 +10,7 @@ defined( '_JEXEC' ) or die; -require_once JPATH_COMPONENT.'/helpers/helper_session.php'; +require_once JPATH_COMPONENT.'/helpers/helper_session.php'; // View class CCKViewSession extends JCckBaseLegacyViewForm @@ -39,6 +39,8 @@ function prepareDisplay() $this->isNew = ( @$this->item->id > 0 ) ? 0 : 1; Helper_Admin::addToolbarEdit( $this->vName, _C8_TEXT, array( 'isNew'=>$this->isNew, 'folder'=>0, 'checked_out'=>'' ) ); + + return true; } } ?> \ No newline at end of file diff --git a/administrator/components/com_cck/views/site/view.html.php b/administrator/components/com_cck/views/site/view.html.php index 0a826aa11..e87acb534 100644 --- a/administrator/components/com_cck/views/site/view.html.php +++ b/administrator/components/com_cck/views/site/view.html.php @@ -39,6 +39,8 @@ function prepareDisplay() $this->item->options = ( $this->item->options ) ? JCckDev::fromJSON( $this->item->options ) : array(); Helper_Admin::addToolbarEdit( $this->vName, _C5_TEXT, array( 'isNew'=>$this->isNew, 'folder'=>0, 'checked_out'=>$this->item->checked_out ) ); + + return true; } } ?> \ No newline at end of file diff --git a/administrator/components/com_cck/views/template/view.html.php b/administrator/components/com_cck/views/template/view.html.php index af836e012..27580562d 100644 --- a/administrator/components/com_cck/views/template/view.html.php +++ b/administrator/components/com_cck/views/template/view.html.php @@ -44,6 +44,8 @@ function prepareDisplay() } Helper_Admin::addToolbarEdit( $this->vName, _C1_TEXT, array( 'isNew'=>$this->isNew, 'folder'=>$this->state->get( 'filter.folder' ), 'checked_out'=>$this->item->checked_out ) ); + + return true; } // _generateTree diff --git a/administrator/components/com_cck/views/type/view.html.php b/administrator/components/com_cck/views/type/view.html.php index f3e88c786..9363e7c69 100644 --- a/administrator/components/com_cck/views/type/view.html.php +++ b/administrator/components/com_cck/views/type/view.html.php @@ -134,6 +134,8 @@ function prepareDisplay() $this->insidebox = Helper_Admin::addInsidebox( $this->isNew ); Helper_Admin::addToolbarEdit( $this->vName, 'COM_CCK_'._C2_TEXT, array( 'isNew'=>$this->isNew, 'folder'=>$this->state->get( 'filter.folder' ), 'checked_out'=>$this->item->checked_out ), array( 'template' => $this->style->template ) ); + + return true; } } ?> \ No newline at end of file diff --git a/administrator/components/com_cck/views/type/view.raw.php b/administrator/components/com_cck/views/type/view.raw.php index 867b1d9ab..748e33594 100644 --- a/administrator/components/com_cck/views/type/view.raw.php +++ b/administrator/components/com_cck/views/type/view.raw.php @@ -108,6 +108,8 @@ function prepareDisplay() $this->item->template = $this->style->template; Helper_Admin::addToolbarEdit( $this->vName, 'COM_CCK_'._C2_TEXT, array( 'isNew'=>$this->isNew, 'folder'=>$this->state->get( 'filter.folder' ), 'checked_out'=>$this->item->checked_out ), array( 'template' => $this->style->template ) ); + + return true; } // prepareDisplay_Ajax diff --git a/administrator/components/com_cck/views/version/view.html.php b/administrator/components/com_cck/views/version/view.html.php index 08889f381..e8570f157 100644 --- a/administrator/components/com_cck/views/version/view.html.php +++ b/administrator/components/com_cck/views/version/view.html.php @@ -37,6 +37,8 @@ function prepareDisplay() $this->item->title = JCckDatabase::loadResult( 'SELECT title FROM #__cck_core_'.$type.'s WHERE id = '.(int)$this->item->e_id ); Helper_Admin::addToolbarEdit( $this->vName, _C6_TEXT, array( 'isNew'=>$this->isNew, 'folder'=>0, 'checked_out'=>$this->item->checked_out ) ); + + return true; } } ?> \ No newline at end of file diff --git a/components/com_cck/controller.php b/components/com_cck/controller.php index 883491783..85af19045 100644 --- a/components/com_cck/controller.php +++ b/components/com_cck/controller.php @@ -395,7 +395,7 @@ public function getRoute() return JUri::root(); } require_once JPATH_SITE.'/plugins/cck_storage_location/'.$location.'/'.$location.'.php'; - echo JCck::callFunc_Array( 'plgCCK_Storage_Location'.$location, 'getRoute', array( $pk, $sef, $itemId, array( 'type'=>$type ) ) ); + return JCck::callFunc_Array( 'plgCCK_Storage_Location'.$location, 'getRoute', array( $pk, $sef, $itemId, array( 'type'=>$type ) ) ); } // process @@ -662,6 +662,8 @@ public function save( $isAjax = false ) } else { $this->setRedirect( htmlspecialchars_decode( $link ) ); } + + return true; } // saveOrderAjax diff --git a/components/com_cck/controllers/box.php b/components/com_cck/controllers/box.php index 42febf042..eccde33eb 100644 --- a/components/com_cck/controllers/box.php +++ b/components/com_cck/controllers/box.php @@ -41,6 +41,8 @@ public function add() $app->setUserState( 'com_cck.add.box.bx.name', $app->input->get( 'name', '' ) ); $app->setUserState( 'com_cck.add.box.bx.type', $app->input->getString( 'type', '' ) ); $app->setUserState( 'com_cck.add.box.bx.params', $app->input->getString( 'params', '' ) ); + + return true; } } ?> \ No newline at end of file diff --git a/libraries/cck/base/install/export.php b/libraries/cck/base/install/export.php index 518b7eb5a..b51f92931 100644 --- a/libraries/cck/base/install/export.php +++ b/libraries/cck/base/install/export.php @@ -211,6 +211,8 @@ public static function findFields( $paths, $dest = '' ) } } } + + return true; } // exportFields diff --git a/libraries/cck/development/plugins/plg_cck_field/%name%.php b/libraries/cck/development/plugins/plg_cck_field/%name%.php index ef55739c9..2f66b7a73 100644 --- a/libraries/cck/development/plugins/plg_cck_field/%name%.php +++ b/libraries/cck/development/plugins/plg_cck_field/%name%.php @@ -91,6 +91,8 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -107,6 +109,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore @@ -131,7 +135,7 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array( return $value; } $field->value = $value; - parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); + return parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); } // -------- -------- -------- -------- -------- -------- -------- -------- // Render diff --git a/libraries/cck/development/plugins/plg_cck_storage_location/%name%.php b/libraries/cck/development/plugins/plg_cck_storage_location/%name%.php index 3613f46d0..437779868 100644 --- a/libraries/cck/development/plugins/plg_cck_storage_location/%name%.php +++ b/libraries/cck/development/plugins/plg_cck_storage_location/%name%.php @@ -239,8 +239,8 @@ protected function _core( $data, &$config = array(), $pk = 0 ) $config['author'] = $table->{self::$author}; // TODO $config['parent'] = $table->{self::$parent}; // TODO - - parent::g_onCCK_Storage_LocationStore( $data, self::$table, self::$pk, $config ); + + return parent::g_onCCK_Storage_LocationStore( $data, self::$table, self::$pk, $config ); } // _getTable diff --git a/libraries/cck/joomla/access/rules.php b/libraries/cck/joomla/access/rules.php index 10f445f79..c0a365d7a 100644 --- a/libraries/cck/joomla/access/rules.php +++ b/libraries/cck/joomla/access/rules.php @@ -59,6 +59,8 @@ public function __construct($input = '', $component = '', $section = '') $this->mergeAction($action, $identities); } } + + return true; } /** diff --git a/libraries/cck/joomla/application/component/controllerform.php b/libraries/cck/joomla/application/component/controllerform.php index 16dc397d5..05af763b3 100644 --- a/libraries/cck/joomla/application/component/controllerform.php +++ b/libraries/cck/joomla/application/component/controllerform.php @@ -34,6 +34,8 @@ public function save($key = null, $urlVar = null) } else { return parent::save( $key, $urlVar ); } + + return true; } /** diff --git a/libraries/cck/rendering/document/document.php b/libraries/cck/rendering/document/document.php index 6178c2b86..309edac49 100644 --- a/libraries/cck/rendering/document/document.php +++ b/libraries/cck/rendering/document/document.php @@ -51,6 +51,8 @@ class CCK_Document extends JObject public function __construct($options = array()) { parent::__construct(); + + return true; } /** @@ -120,6 +122,8 @@ public static function &getInstance($type = 'html', $attributes = array()) //pub public function setType($type) { $this->_type = $type; + + return true; } /** @@ -212,6 +216,8 @@ public function parse($params = array()) public function render($cache = false, $params = array()) { $this->id++; + + return true; } // finalize diff --git a/libraries/cck/rendering/document/html/html.php b/libraries/cck/rendering/document/html/html.php index c07a4b35b..b23d51d41 100644 --- a/libraries/cck/rendering/document/html/html.php +++ b/libraries/cck/rendering/document/html/html.php @@ -312,6 +312,8 @@ protected function _parseTemplate() // ! $this->_template_tags = $template_tags_first + $template_tags_last; } + + return true; } /** diff --git a/libraries/cck/rendering/document/html/renderer/component.php b/libraries/cck/rendering/document/html/renderer/component.php index 56d88584a..3f25b7435 100644 --- a/libraries/cck/rendering/document/html/renderer/component.php +++ b/libraries/cck/rendering/document/html/renderer/component.php @@ -24,5 +24,6 @@ class CCK_DocumentRendererComponent extends CCK_DocumentRenderer */ public function render($component = null, $params = array(), $content = null) { + return true; } } diff --git a/libraries/cck/rendering/document/html/renderer/head.php b/libraries/cck/rendering/document/html/renderer/head.php index a46239bf2..8a7f7bfcf 100644 --- a/libraries/cck/rendering/document/html/renderer/head.php +++ b/libraries/cck/rendering/document/html/renderer/head.php @@ -26,6 +26,7 @@ class CCK_DocumentRendererHead extends CCK_DocumentRenderer */ public function render($head, $params = array(), $content = null) { + return true; } /** @@ -39,5 +40,6 @@ public function render($head, $params = array(), $content = null) */ public function fetchHead(&$document) { + return true; } } \ No newline at end of file diff --git a/libraries/cck/rendering/document/html/renderer/message.php b/libraries/cck/rendering/document/html/renderer/message.php index aad007525..b7a513f5c 100644 --- a/libraries/cck/rendering/document/html/renderer/message.php +++ b/libraries/cck/rendering/document/html/renderer/message.php @@ -24,5 +24,6 @@ class CCK_DocumentRendererMessage extends CCK_DocumentRenderer */ public function render($name, $params = array (), $content = null) { + return true; } } diff --git a/libraries/cck/rendering/document/html/renderer/module.php b/libraries/cck/rendering/document/html/renderer/module.php index d18fe7b56..6e27371db 100644 --- a/libraries/cck/rendering/document/html/renderer/module.php +++ b/libraries/cck/rendering/document/html/renderer/module.php @@ -24,5 +24,6 @@ class CCK_DocumentRendererModule extends CCK_DocumentRenderer */ public function render($module, $attribs = array(), $content = null) { + return true; } } diff --git a/libraries/cck/rendering/document/html/renderer/modules.php b/libraries/cck/rendering/document/html/renderer/modules.php index 33acf2ca4..a5b155932 100644 --- a/libraries/cck/rendering/document/html/renderer/modules.php +++ b/libraries/cck/rendering/document/html/renderer/modules.php @@ -23,5 +23,6 @@ class CCK_DocumentRendererModules extends CCK_DocumentRenderer */ public function render($position, $params = array(), $content = null) { + return true; } } \ No newline at end of file diff --git a/libraries/cck/rendering/document/renderer.php b/libraries/cck/rendering/document/renderer.php index 893bf6ea2..87a48dbf1 100644 --- a/libraries/cck/rendering/document/renderer.php +++ b/libraries/cck/rendering/document/renderer.php @@ -51,6 +51,7 @@ public function __construct(&$doc) */ public function render($name, $params = null, $content = null) { + return true; } /** diff --git a/libraries/cck/rendering/rendering.php b/libraries/cck/rendering/rendering.php index caf0f9532..d30c4014c 100644 --- a/libraries/cck/rendering/rendering.php +++ b/libraries/cck/rendering/rendering.php @@ -103,6 +103,8 @@ public function __call( $method, $args ) } } } + + return true; } // __get @@ -110,6 +112,8 @@ public function __get( $property ) { if ( isset( $this->$property ) ) { return $this->$property; } + + return true; } // doDebug @@ -252,6 +256,8 @@ public function initialize() } } } + + return true; } // initRendering diff --git a/libraries/cck/rendering/rendering_item.php b/libraries/cck/rendering/rendering_item.php index 2ac678f35..294029d25 100644 --- a/libraries/cck/rendering/rendering_item.php +++ b/libraries/cck/rendering/rendering_item.php @@ -77,6 +77,8 @@ public function __call( $method, $args ) } } } + + return true; } // __get @@ -84,6 +86,8 @@ public function __get( $property ) { if ( isset( $this->$property ) ) { return $this->$property; } + + return true; } // initialize diff --git a/libraries/cms/cck/base/legacy/view/list.php b/libraries/cms/cck/base/legacy/view/list.php index 56036f5d1..49f83934f 100644 --- a/libraries/cms/cck/base/legacy/view/list.php +++ b/libraries/cms/cck/base/legacy/view/list.php @@ -36,7 +36,7 @@ public function display( $tpl = NULL ) $this->prepareUI(); $this->completeUI(); - parent::display( $tpl ); + return parent::display( $tpl ); } // getSortFields diff --git a/libraries/cms/cck/cck.php b/libraries/cms/cck/cck.php index e05987dbf..732b30d2f 100644 --- a/libraries/cms/cck/cck.php +++ b/libraries/cms/cck/cck.php @@ -74,7 +74,7 @@ public static function _setConfig() } } - self::$_config =& $config; + return self::$_config =& $config; } // getConfig diff --git a/libraries/cms/cck/content.php b/libraries/cms/cck/content.php index bfeb1a53a..c83ec091d 100644 --- a/libraries/cms/cck/content.php +++ b/libraries/cms/cck/content.php @@ -348,6 +348,8 @@ public function load( $identifier, $data = true ) . ' WHERE a.'.$this->_columns['key'].' = '.(int)$this->_pk; $this->_properties = JCckDatabase::loadObject( $query ); } + + return true; } // set diff --git a/libraries/cms/cck/dev/image.php b/libraries/cms/cck/dev/image.php index 3dbe9e267..a80168164 100644 --- a/libraries/cms/cck/dev/image.php +++ b/libraries/cms/cck/dev/image.php @@ -62,6 +62,8 @@ public function __call( $method, $args ) return $this->$target; } } + + return true; } // createThumb diff --git a/libraries/cms/cck/ecommerce.php b/libraries/cms/cck/ecommerce.php index 459aa36c4..a871cee85 100644 --- a/libraries/cms/cck/ecommerce.php +++ b/libraries/cms/cck/ecommerce.php @@ -33,7 +33,7 @@ public static function _setConfig() $config = new stdClass; $config->params = JComponentHelper::getParams( 'com_'.self::$_me ); - self::$_config =& $config; + return self::$_config =& $config; } // getConfig diff --git a/libraries/cms/cck/field.php b/libraries/cms/cck/field.php index 1bfc87a2a..baf6ad599 100644 --- a/libraries/cms/cck/field.php +++ b/libraries/cms/cck/field.php @@ -39,6 +39,8 @@ public function __call( $method, $args ) if ( $prefix == 'get' ) { return ( $property ) ? $this->_params->$property : $this->_params; } + + return true; } // getInstance @@ -84,6 +86,8 @@ public function render() if ( isset( $this->_params->type ) ) { return JCck::callFunc_Array( 'plgCCK_Field'.$this->_params->type, 'onCCK_FieldRender'.$this->_config['mode'], array( $this->_params, &$this->_config ) ); } + + return true; } } ?> \ No newline at end of file diff --git a/libraries/cms/cck/legacy.php b/libraries/cms/cck/legacy.php index fb9f085c3..efc21ab66 100644 --- a/libraries/cms/cck/legacy.php +++ b/libraries/cms/cck/legacy.php @@ -22,6 +22,8 @@ public static function _setUser( $userid = 0, $profile = true, $preferences = fa jimport( 'cck.content.user' ); self::$_user = CCK_User::getUser( $userid, $profile, $preferences ); + + return self::$_user; } // getUser diff --git a/libraries/cms/cck/table/batch.php b/libraries/cms/cck/table/batch.php index d8a9a2b74..12a5dec89 100644 --- a/libraries/cms/cck/table/batch.php +++ b/libraries/cms/cck/table/batch.php @@ -163,6 +163,8 @@ public function delete( $where_clause ) if ( ! $this->_db->execute() ) { return false; } + + return true; } // dump @@ -259,6 +261,8 @@ public function store() if ( ! $this->_db->execute() ) { return false; } + + return true; } } ?> \ No newline at end of file diff --git a/libraries/cms/cck/webservice.php b/libraries/cms/cck/webservice.php index ee653b371..05e244fc0 100644 --- a/libraries/cms/cck/webservice.php +++ b/libraries/cms/cck/webservice.php @@ -36,6 +36,8 @@ public static function _setConfig() } self::$_config =& $config; + + return self::$_config; } // getConfig diff --git a/plugins/cck_field/42/42.php b/plugins/cck_field/42/42.php index 54ddef135..43f3bf278 100644 --- a/plugins/cck_field/42/42.php +++ b/plugins/cck_field/42/42.php @@ -100,6 +100,8 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -116,6 +118,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore @@ -149,7 +153,7 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array( } $field->value = $value; - parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); + return parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); } // -------- -------- -------- -------- -------- -------- -------- -------- // Render diff --git a/plugins/cck_field/button_free/button_free.php b/plugins/cck_field/button_free/button_free.php index 97d4748ff..6c34a9502 100644 --- a/plugins/cck_field/button_free/button_free.php +++ b/plugins/cck_field/button_free/button_free.php @@ -304,6 +304,8 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -320,6 +322,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore diff --git a/plugins/cck_field/button_submit/button_submit.php b/plugins/cck_field/button_submit/button_submit.php index 0542c8d27..34dd1f9db 100644 --- a/plugins/cck_field/button_submit/button_submit.php +++ b/plugins/cck_field/button_submit/button_submit.php @@ -312,6 +312,8 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -328,6 +330,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore diff --git a/plugins/cck_field/calendar/calendar.php b/plugins/cck_field/calendar/calendar.php index 4df8fb1ef..2de9fbd79 100644 --- a/plugins/cck_field/calendar/calendar.php +++ b/plugins/cck_field/calendar/calendar.php @@ -155,6 +155,8 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareResource @@ -257,6 +259,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore @@ -297,7 +301,7 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array( } $field->value = $value; - parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); + return parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); } // -------- -------- -------- -------- -------- -------- -------- -------- // Render diff --git a/plugins/cck_field/checkbox/checkbox.php b/plugins/cck_field/checkbox/checkbox.php index ae37f473e..409d12764 100644 --- a/plugins/cck_field/checkbox/checkbox.php +++ b/plugins/cck_field/checkbox/checkbox.php @@ -276,6 +276,8 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -303,6 +305,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore @@ -343,7 +347,7 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array( } $field->text = $text; $field->value = $value; - parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); + return parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); } // -------- -------- -------- -------- -------- -------- -------- -------- // Render diff --git a/plugins/cck_field/colorpicker/colorpicker.php b/plugins/cck_field/colorpicker/colorpicker.php index 2e379c2d7..d495ada24 100644 --- a/plugins/cck_field/colorpicker/colorpicker.php +++ b/plugins/cck_field/colorpicker/colorpicker.php @@ -88,6 +88,8 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -104,6 +106,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore @@ -128,7 +132,7 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array( return $value; } $field->value = $value; - parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); + return parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); } // -------- -------- -------- -------- -------- -------- -------- -------- // Render diff --git a/plugins/cck_field/div/div.php b/plugins/cck_field/div/div.php index f2ec4a222..4c023ea31 100644 --- a/plugins/cck_field/div/div.php +++ b/plugins/cck_field/div/div.php @@ -148,6 +148,8 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -164,6 +166,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore diff --git a/plugins/cck_field/email/email.php b/plugins/cck_field/email/email.php index c6d383dc9..ca2b4bc31 100644 --- a/plugins/cck_field/email/email.php +++ b/plugins/cck_field/email/email.php @@ -91,6 +91,8 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -107,6 +109,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore @@ -219,7 +223,7 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array( return $value; } $field->value = $value; - parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); + return parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); } // -------- -------- -------- -------- -------- -------- -------- -------- // Render diff --git a/plugins/cck_field/field_x/field_x.php b/plugins/cck_field/field_x/field_x.php index cb30e3cc1..b72f4ae92 100644 --- a/plugins/cck_field/field_x/field_x.php +++ b/plugins/cck_field/field_x/field_x.php @@ -163,6 +163,8 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -179,6 +181,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore diff --git a/plugins/cck_field/freetext/freetext.php b/plugins/cck_field/freetext/freetext.php index 1c25f7d33..863d6ef70 100644 --- a/plugins/cck_field/freetext/freetext.php +++ b/plugins/cck_field/freetext/freetext.php @@ -108,6 +108,8 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -124,6 +126,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore diff --git a/plugins/cck_field/group/group.php b/plugins/cck_field/group/group.php index 0e185f457..c18a567bf 100644 --- a/plugins/cck_field/group/group.php +++ b/plugins/cck_field/group/group.php @@ -176,6 +176,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore diff --git a/plugins/cck_field/group_x/group_x.php b/plugins/cck_field/group_x/group_x.php index 712ab0d2d..4893703c7 100644 --- a/plugins/cck_field/group_x/group_x.php +++ b/plugins/cck_field/group_x/group_x.php @@ -242,6 +242,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore diff --git a/plugins/cck_field/hidden/hidden.php b/plugins/cck_field/hidden/hidden.php index 987335f97..d319b6280 100644 --- a/plugins/cck_field/hidden/hidden.php +++ b/plugins/cck_field/hidden/hidden.php @@ -83,6 +83,8 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -99,6 +101,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore @@ -127,7 +131,7 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array( return $value; } $field->value = $value; - parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); + return parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); } // -------- -------- -------- -------- -------- -------- -------- -------- // Render diff --git a/plugins/cck_field/jform_accesslevel/jform_accesslevel.php b/plugins/cck_field/jform_accesslevel/jform_accesslevel.php index 13505f013..92916f710 100644 --- a/plugins/cck_field/jform_accesslevel/jform_accesslevel.php +++ b/plugins/cck_field/jform_accesslevel/jform_accesslevel.php @@ -121,6 +121,8 @@ class="'.$class.'" if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -141,6 +143,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore @@ -165,7 +169,7 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array( return $value; } $field->value = $value; - parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); + return parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); } // -------- -------- -------- -------- -------- -------- -------- -------- // Render diff --git a/plugins/cck_field/jform_associations/jform_associations.php b/plugins/cck_field/jform_associations/jform_associations.php index e605dc0f5..2cf281e95 100644 --- a/plugins/cck_field/jform_associations/jform_associations.php +++ b/plugins/cck_field/jform_associations/jform_associations.php @@ -100,6 +100,8 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -116,6 +118,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore @@ -140,7 +144,7 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array( return $value; } $field->value = $value; - parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); + return parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); } // -------- -------- -------- -------- -------- -------- -------- -------- // Render diff --git a/plugins/cck_field/jform_category/jform_category.php b/plugins/cck_field/jform_category/jform_category.php index 658d3fb56..e02762097 100644 --- a/plugins/cck_field/jform_category/jform_category.php +++ b/plugins/cck_field/jform_category/jform_category.php @@ -178,6 +178,8 @@ class="'.$class.'"'.$size.' if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -198,6 +200,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore @@ -222,7 +226,7 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array( return $value; } $field->value = $value; - parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); + return parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); } // -------- -------- -------- -------- -------- -------- -------- -------- // Render diff --git a/plugins/cck_field/jform_componentlayout/jform_componentlayout.php b/plugins/cck_field/jform_componentlayout/jform_componentlayout.php index f52f80e98..a49197e03 100644 --- a/plugins/cck_field/jform_componentlayout/jform_componentlayout.php +++ b/plugins/cck_field/jform_componentlayout/jform_componentlayout.php @@ -109,6 +109,8 @@ class="'.$class.'" if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -125,6 +127,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore @@ -149,7 +153,7 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array( return $value; } $field->value = $value; - parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); + return parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); } // -------- -------- -------- -------- -------- -------- -------- -------- // Render diff --git a/plugins/cck_field/jform_contentlanguage/jform_contentlanguage.php b/plugins/cck_field/jform_contentlanguage/jform_contentlanguage.php index 7e7ed0f88..433e78698 100644 --- a/plugins/cck_field/jform_contentlanguage/jform_contentlanguage.php +++ b/plugins/cck_field/jform_contentlanguage/jform_contentlanguage.php @@ -108,6 +108,8 @@ class="'.$class.'" if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -124,6 +126,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore @@ -148,7 +152,7 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array( return $value; } $field->value = $value; - parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); + return parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); } // -------- -------- -------- -------- -------- -------- -------- -------- // Render diff --git a/plugins/cck_field/jform_editors/jform_editors.php b/plugins/cck_field/jform_editors/jform_editors.php index c28fbaa42..a60db62f3 100644 --- a/plugins/cck_field/jform_editors/jform_editors.php +++ b/plugins/cck_field/jform_editors/jform_editors.php @@ -103,6 +103,8 @@ class="'.$class.'" if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -119,6 +121,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore @@ -143,7 +147,7 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array( return $value; } $field->value = $value; - parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); + return parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); } // -------- -------- -------- -------- -------- -------- -------- -------- // Render diff --git a/plugins/cck_field/jform_groupparent/jform_groupparent.php b/plugins/cck_field/jform_groupparent/jform_groupparent.php index 2c3294fa2..3cd8fa7fe 100644 --- a/plugins/cck_field/jform_groupparent/jform_groupparent.php +++ b/plugins/cck_field/jform_groupparent/jform_groupparent.php @@ -107,6 +107,8 @@ class="'.$class.'" if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -123,6 +125,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore @@ -147,7 +151,7 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array( return $value; } $field->value = $value; - parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); + return parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); } // -------- -------- -------- -------- -------- -------- -------- -------- // Render diff --git a/plugins/cck_field/jform_helpsite/jform_helpsite.php b/plugins/cck_field/jform_helpsite/jform_helpsite.php index 010bf650e..f9b2f9cf6 100644 --- a/plugins/cck_field/jform_helpsite/jform_helpsite.php +++ b/plugins/cck_field/jform_helpsite/jform_helpsite.php @@ -100,6 +100,8 @@ class="'.$class.'" if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -116,6 +118,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore @@ -140,7 +144,7 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array( return $value; } $field->value = $value; - parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); + return parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); } // -------- -------- -------- -------- -------- -------- -------- -------- // Render diff --git a/plugins/cck_field/jform_media/jform_media.php b/plugins/cck_field/jform_media/jform_media.php index 8a7dcb3cb..a66a27021 100644 --- a/plugins/cck_field/jform_media/jform_media.php +++ b/plugins/cck_field/jform_media/jform_media.php @@ -100,6 +100,8 @@ class="'.$class.'" if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -116,6 +118,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore @@ -140,7 +144,7 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array( return $value; } $field->value = $value; - parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); + return parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); } // -------- -------- -------- -------- -------- -------- -------- -------- // Render diff --git a/plugins/cck_field/jform_menuitem/jform_menuitem.php b/plugins/cck_field/jform_menuitem/jform_menuitem.php index 7dd64899b..64b08d27d 100644 --- a/plugins/cck_field/jform_menuitem/jform_menuitem.php +++ b/plugins/cck_field/jform_menuitem/jform_menuitem.php @@ -161,6 +161,8 @@ class="'.$class.'" if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -177,6 +179,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore @@ -201,7 +205,7 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array( return $value; } $field->value = $value; - parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); + return parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); } // -------- -------- -------- -------- -------- -------- -------- -------- // Render diff --git a/plugins/cck_field/jform_rules/jform_rules.php b/plugins/cck_field/jform_rules/jform_rules.php index 6f6a7d4fa..8058d298b 100644 --- a/plugins/cck_field/jform_rules/jform_rules.php +++ b/plugins/cck_field/jform_rules/jform_rules.php @@ -141,6 +141,8 @@ class="readonly" if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -157,6 +159,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore @@ -181,7 +185,7 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array( return $value; } $field->value = $value; - parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); + return parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); } // -------- -------- -------- -------- -------- -------- -------- -------- // Render diff --git a/plugins/cck_field/jform_tag/jform_tag.php b/plugins/cck_field/jform_tag/jform_tag.php index c8da2d5b3..7acb6d53a 100644 --- a/plugins/cck_field/jform_tag/jform_tag.php +++ b/plugins/cck_field/jform_tag/jform_tag.php @@ -142,6 +142,8 @@ class="'.$class.'" if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -193,6 +195,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore @@ -250,7 +254,7 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array( } } - parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); + return parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); } // -------- -------- -------- -------- -------- -------- -------- -------- // Render diff --git a/plugins/cck_field/jform_templatestyle/jform_templatestyle.php b/plugins/cck_field/jform_templatestyle/jform_templatestyle.php index c97920b12..bc3668be7 100644 --- a/plugins/cck_field/jform_templatestyle/jform_templatestyle.php +++ b/plugins/cck_field/jform_templatestyle/jform_templatestyle.php @@ -104,6 +104,8 @@ class="'.$class.'" if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -120,6 +122,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore @@ -144,7 +148,7 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array( return $value; } $field->value = $value; - parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); + return parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); } // -------- -------- -------- -------- -------- -------- -------- -------- // Render diff --git a/plugins/cck_field/jform_timezone/jform_timezone.php b/plugins/cck_field/jform_timezone/jform_timezone.php index 3129625a0..d4268d740 100644 --- a/plugins/cck_field/jform_timezone/jform_timezone.php +++ b/plugins/cck_field/jform_timezone/jform_timezone.php @@ -102,6 +102,8 @@ class="'.$class.'" if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -118,6 +120,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore @@ -142,7 +146,7 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array( return $value; } $field->value = $value; - parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); + return parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); } // -------- -------- -------- -------- -------- -------- -------- -------- // Render diff --git a/plugins/cck_field/jform_user/jform_user.php b/plugins/cck_field/jform_user/jform_user.php index 9fecea44c..742aaf527 100644 --- a/plugins/cck_field/jform_user/jform_user.php +++ b/plugins/cck_field/jform_user/jform_user.php @@ -134,6 +134,8 @@ class="'.$class.'" if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -150,6 +152,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore @@ -175,7 +179,7 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array( return $value; } $field->value = $value; - parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); + return parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); } // -------- -------- -------- -------- -------- -------- -------- -------- // Render diff --git a/plugins/cck_field/jform_usergroups/jform_usergroups.php b/plugins/cck_field/jform_usergroups/jform_usergroups.php index ff4204565..f8015c7db 100644 --- a/plugins/cck_field/jform_usergroups/jform_usergroups.php +++ b/plugins/cck_field/jform_usergroups/jform_usergroups.php @@ -123,6 +123,8 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -181,6 +183,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore @@ -205,7 +209,7 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array( return $value; } $field->value = $value; - parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); + return parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); } // -------- -------- -------- -------- -------- -------- -------- -------- // Render diff --git a/plugins/cck_field/joomla_module/joomla_module.php b/plugins/cck_field/joomla_module/joomla_module.php index 2cbd4892e..d4dd3254a 100644 --- a/plugins/cck_field/joomla_module/joomla_module.php +++ b/plugins/cck_field/joomla_module/joomla_module.php @@ -111,6 +111,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore diff --git a/plugins/cck_field/link/link.php b/plugins/cck_field/link/link.php index b340e411f..06e807b8d 100644 --- a/plugins/cck_field/link/link.php +++ b/plugins/cck_field/link/link.php @@ -199,6 +199,8 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -215,6 +217,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore @@ -257,7 +261,7 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array( } $field->value = $value; - parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); + return parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); } // -------- -------- -------- -------- -------- -------- -------- -------- // Render diff --git a/plugins/cck_field/password/password.php b/plugins/cck_field/password/password.php index 8ccaaf419..e60b4d02a 100644 --- a/plugins/cck_field/password/password.php +++ b/plugins/cck_field/password/password.php @@ -90,6 +90,8 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -106,6 +108,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore @@ -132,7 +136,7 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array( return $value; } $field->value = $value; - parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); + return parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); } // -------- -------- -------- -------- -------- -------- -------- -------- // Render diff --git a/plugins/cck_field/radio/radio.php b/plugins/cck_field/radio/radio.php index 71210a153..3c66948bf 100644 --- a/plugins/cck_field/radio/radio.php +++ b/plugins/cck_field/radio/radio.php @@ -217,6 +217,8 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -237,6 +239,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore @@ -268,7 +272,7 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array( } $field->text = $text; $field->value = $value; - parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); + return parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); } // -------- -------- -------- -------- -------- -------- -------- -------- // Render diff --git a/plugins/cck_field/search_generic/search_generic.php b/plugins/cck_field/search_generic/search_generic.php index d291b24bf..0a138f02c 100644 --- a/plugins/cck_field/search_generic/search_generic.php +++ b/plugins/cck_field/search_generic/search_generic.php @@ -107,6 +107,8 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -137,6 +139,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore @@ -161,7 +165,7 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array( return $value; } $field->value = $value; - parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); + return parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); } // -------- -------- -------- -------- -------- -------- -------- -------- // Render diff --git a/plugins/cck_field/search_ordering/search_ordering.php b/plugins/cck_field/search_ordering/search_ordering.php index e53ae8ec8..edf53a95e 100644 --- a/plugins/cck_field/search_ordering/search_ordering.php +++ b/plugins/cck_field/search_ordering/search_ordering.php @@ -133,6 +133,8 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -205,6 +207,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore @@ -229,7 +233,7 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array( return $value; } $field->value = $value; - parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); + return parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); } // -------- -------- -------- -------- -------- -------- -------- -------- // Render diff --git a/plugins/cck_field/select_dynamic/select_dynamic.php b/plugins/cck_field/select_dynamic/select_dynamic.php index b14458182..aa5d52740 100644 --- a/plugins/cck_field/select_dynamic/select_dynamic.php +++ b/plugins/cck_field/select_dynamic/select_dynamic.php @@ -485,6 +485,8 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -515,6 +517,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore @@ -583,7 +587,7 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array( } $field->text = $text; $field->value = $value; - parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); + return parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); } // -------- -------- -------- -------- -------- -------- -------- -------- // Render diff --git a/plugins/cck_field/select_multiple/select_multiple.php b/plugins/cck_field/select_multiple/select_multiple.php index fe9b646a6..cf46b0c4e 100644 --- a/plugins/cck_field/select_multiple/select_multiple.php +++ b/plugins/cck_field/select_multiple/select_multiple.php @@ -198,6 +198,8 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -225,6 +227,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore @@ -265,7 +269,7 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array( } $field->text = $text; $field->value = $value; - parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); + return parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); } // -------- -------- -------- -------- -------- -------- -------- -------- // Render diff --git a/plugins/cck_field/select_numeric/select_numeric.php b/plugins/cck_field/select_numeric/select_numeric.php index cda20cf04..4739d5b2d 100644 --- a/plugins/cck_field/select_numeric/select_numeric.php +++ b/plugins/cck_field/select_numeric/select_numeric.php @@ -94,6 +94,8 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -114,6 +116,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore @@ -138,7 +142,7 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array( return $value; } $field->value = $value; - parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); + return parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); } // -------- -------- -------- -------- -------- -------- -------- -------- // Render diff --git a/plugins/cck_field/select_simple/select_simple.php b/plugins/cck_field/select_simple/select_simple.php index 6ef8af43b..49fcb1b6e 100644 --- a/plugins/cck_field/select_simple/select_simple.php +++ b/plugins/cck_field/select_simple/select_simple.php @@ -306,6 +306,8 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -326,6 +328,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore @@ -359,7 +363,7 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array( } $field->text = $text; //todo: move up $field->value = $value; //todo: move up - parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); + return parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); } // -------- -------- -------- -------- -------- -------- -------- -------- // Render diff --git a/plugins/cck_field/storage/storage.php b/plugins/cck_field/storage/storage.php index 30b5c64c4..52dbee49f 100644 --- a/plugins/cck_field/storage/storage.php +++ b/plugins/cck_field/storage/storage.php @@ -87,6 +87,8 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch diff --git a/plugins/cck_field/tabs/tabs.php b/plugins/cck_field/tabs/tabs.php index b44485da1..9f7a5383a 100644 --- a/plugins/cck_field/tabs/tabs.php +++ b/plugins/cck_field/tabs/tabs.php @@ -130,6 +130,8 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -146,6 +148,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore diff --git a/plugins/cck_field/text/text.php b/plugins/cck_field/text/text.php index 49fb828d0..627112f57 100644 --- a/plugins/cck_field/text/text.php +++ b/plugins/cck_field/text/text.php @@ -146,6 +146,8 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -165,6 +167,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore @@ -189,7 +193,7 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array( return $value; } $field->value = $value; - parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); + return parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); } // -------- -------- -------- -------- -------- -------- -------- -------- // Render diff --git a/plugins/cck_field/textarea/textarea.php b/plugins/cck_field/textarea/textarea.php index 602471fc5..96225eeec 100644 --- a/plugins/cck_field/textarea/textarea.php +++ b/plugins/cck_field/textarea/textarea.php @@ -114,6 +114,8 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -130,6 +132,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore @@ -158,7 +162,7 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array( return $value; } $field->value = $value; - parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); + return parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); } // -------- -------- -------- -------- -------- -------- -------- -------- // Render diff --git a/plugins/cck_field/upload_file/upload_file.php b/plugins/cck_field/upload_file/upload_file.php index dda3497fb..2f2f66590 100644 --- a/plugins/cck_field/upload_file/upload_file.php +++ b/plugins/cck_field/upload_file/upload_file.php @@ -389,6 +389,8 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -425,6 +427,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore @@ -683,7 +687,7 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array( return $value; } $field->value = $value; - parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); + return parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); } // -------- -------- -------- -------- -------- -------- -------- -------- // Render diff --git a/plugins/cck_field/upload_image/upload_image.php b/plugins/cck_field/upload_image/upload_image.php index 903fd9653..19ba3f8d4 100644 --- a/plugins/cck_field/upload_image/upload_image.php +++ b/plugins/cck_field/upload_image/upload_image.php @@ -404,6 +404,8 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareResource @@ -457,6 +459,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore @@ -687,7 +691,7 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array( return $value; } $field->value = $value; - parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); + return parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); } // -------- -------- -------- -------- -------- -------- -------- -------- // Render @@ -814,6 +818,8 @@ protected static function _addThumb( $image, $options, $thumb ) return false; } } + + return true; } // _checkPath diff --git a/plugins/cck_field/wysiwyg_editor/wysiwyg_editor.php b/plugins/cck_field/wysiwyg_editor/wysiwyg_editor.php index bbf723b4f..e47e7d370 100644 --- a/plugins/cck_field/wysiwyg_editor/wysiwyg_editor.php +++ b/plugins/cck_field/wysiwyg_editor/wysiwyg_editor.php @@ -155,6 +155,8 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareSearch @@ -178,6 +180,8 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array if ( $return === true ) { return $field; } + + return true; } // onCCK_FieldPrepareStore @@ -206,7 +210,7 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array( return $value; } $field->value = $value; - parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); + return parent::g_onCCK_FieldPrepareStore( $field, $name, $value, $config ); } // -------- -------- -------- -------- -------- -------- -------- -------- // Render diff --git a/plugins/cck_field_typo/image/image.php b/plugins/cck_field_typo/image/image.php index 6e8fe2b61..513d2ebb8 100644 --- a/plugins/cck_field_typo/image/image.php +++ b/plugins/cck_field_typo/image/image.php @@ -206,6 +206,8 @@ protected static function _availableThumb( $field, $thumb, $options ) return $options['root'].$field->value; } } + + return true; } // _availableValue @@ -224,6 +226,8 @@ protected static function _availableValue( $field, $thumb, $options ) } } } + + return true; } } ?> \ No newline at end of file diff --git a/plugins/cck_storage_location/joomla_article/classes/importer.php b/plugins/cck_storage_location/joomla_article/classes/importer.php index 398bd051f..763807258 100644 --- a/plugins/cck_storage_location/joomla_article/classes/importer.php +++ b/plugins/cck_storage_location/joomla_article/classes/importer.php @@ -160,6 +160,8 @@ public static function onCCK_Storage_LocationAfterImports( $fields, &$config = a } } } + + return true; } } ?> \ No newline at end of file diff --git a/plugins/cck_storage_location/joomla_article/joomla_article.php b/plugins/cck_storage_location/joomla_article/joomla_article.php index 78d19ec15..2b67fd27b 100644 --- a/plugins/cck_storage_location/joomla_article/joomla_article.php +++ b/plugins/cck_storage_location/joomla_article/joomla_article.php @@ -449,6 +449,8 @@ protected function _core( $data, &$config = array(), $pk = 0 ) if ( JCckDevHelper::hasLanguageAssociations() ) { self::_setAssociations( $table, $data, $isNew, $config ); } + + return true; } // _getTable @@ -625,6 +627,8 @@ protected function _setAssociations( $table, $data, $isNew, $config ) return false; } } + + return true; } // _setFeatured diff --git a/plugins/cck_storage_location/joomla_category/joomla_category.php b/plugins/cck_storage_location/joomla_category/joomla_category.php index 08d1fa98f..4aab203cf 100644 --- a/plugins/cck_storage_location/joomla_category/joomla_category.php +++ b/plugins/cck_storage_location/joomla_category/joomla_category.php @@ -417,6 +417,8 @@ protected function _core( $data, &$config = array(), $pk = 0 ) if ( JCckDevHelper::hasLanguageAssociations() ) { self::_setAssociations( $table, $data, $isNew, $config ); } + + return true; } // _getTable @@ -543,6 +545,8 @@ protected function _setAssociations( $table, $data, $isNew, $config ) return false; } } + + return true; } // -------- -------- -------- -------- -------- -------- -------- -------- // SEF @@ -750,6 +754,8 @@ public static function parseRoute( &$vars, $segments, $n, $config ) if ( $vars['id'] == 0 ) { return JError::raiseError( 404, JText::_( 'JGLOBAL_CATEGORY_NOT_FOUND' ) ); } + + return true; } // setRoutes diff --git a/plugins/cck_storage_location/joomla_user/joomla_user.php b/plugins/cck_storage_location/joomla_user/joomla_user.php index ea9b1d389..83f7be7be 100644 --- a/plugins/cck_storage_location/joomla_user/joomla_user.php +++ b/plugins/cck_storage_location/joomla_user/joomla_user.php @@ -404,7 +404,7 @@ protected function _core( $data, &$config = array(), $pk = 0, $params = array() } $config['author'] = $table->id; - parent::g_onCCK_Storage_LocationStore( $data, self::$table, self::$pk, $config, $params ); + return parent::g_onCCK_Storage_LocationStore( $data, self::$table, self::$pk, $config, $params ); } // _getTable @@ -613,6 +613,8 @@ protected static function _sendMails( $table, $activation, $auto_email, $admin_e } } } + + return true; } // -------- -------- -------- -------- -------- -------- -------- -------- // SEF diff --git a/plugins/cck_storage_location/joomla_user_group/joomla_user_group.php b/plugins/cck_storage_location/joomla_user_group/joomla_user_group.php index a1ad95230..06e2b5e29 100644 --- a/plugins/cck_storage_location/joomla_user_group/joomla_user_group.php +++ b/plugins/cck_storage_location/joomla_user_group/joomla_user_group.php @@ -342,7 +342,7 @@ protected function _core( $data, &$config = array(), $pk = 0, $params = array() } $config['author'] = JFactory::getUser()->id; - parent::g_onCCK_Storage_LocationStore( $data, self::$table, self::$pk, $config, $params ); + return parent::g_onCCK_Storage_LocationStore( $data, self::$table, self::$pk, $config, $params ); } // _getTable diff --git a/plugins/content/cck/cck.php b/plugins/content/cck/cck.php index 72eb2662c..3823cf2a3 100644 --- a/plugins/content/cck/cck.php +++ b/plugins/content/cck/cck.php @@ -245,6 +245,8 @@ public function onContentPrepare( $context, &$article, &$params, $limitstart = 0 } $this->_prepare( $context, $article, $params, $limitstart ); + + return true; } // _prepare diff --git a/plugins/user/cck/cck.php b/plugins/user/cck/cck.php index ce51daa2e..29bbd5b4e 100644 --- a/plugins/user/cck/cck.php +++ b/plugins/user/cck/cck.php @@ -173,6 +173,8 @@ protected function _delete( $pk, $location, $base, $event = '' ) $table->delete(); } } + + return true; } } ?> \ No newline at end of file