diff --git a/libraries/cck/base/form/form.php b/libraries/cck/base/form/form.php index 62e5b177d..e2f16e41f 100644 --- a/libraries/cck/base/form/form.php +++ b/libraries/cck/base/form/form.php @@ -93,7 +93,7 @@ public static function getFields( $type, $client, $stage, $excluded, $idx, $cck public static function getTemplateStyle( $id, $params = array() ) { if ( ! $id ) { - return; + return true; } $query = 'SELECT a.id, a.template as name, a.params FROM #__template_styles AS a' . ' LEFT JOIN #__cck_core_templates AS b ON b.name = a.template' diff --git a/libraries/cck/base/install/export.php b/libraries/cck/base/install/export.php index 518b7eb5a..da67d8813 100644 --- a/libraries/cck/base/install/export.php +++ b/libraries/cck/base/install/export.php @@ -88,7 +88,7 @@ public static function update( $path, $copyright ) } elseif ( is_file( $path ) ) { $paths = array( 0=>$path ); } else { - return; + return true; } if ( count( $paths ) ) { @@ -167,7 +167,7 @@ public static function zip( $path, $path_zip ) require_once JPATH_COMPONENT.'/helpers/pclzip/pclzip.lib.php'; $zip = new PclZip( $path_zip ); if ( $zip->create( $path, PCLZIP_OPT_REMOVE_PATH, $path ) == 0 ) { - return; + return true; } JFolder::delete( $path ); diff --git a/libraries/cck/base/list/list.php b/libraries/cck/base/list/list.php index 793c057ef..0c0dc2621 100644 --- a/libraries/cck/base/list/list.php +++ b/libraries/cck/base/list/list.php @@ -323,7 +323,7 @@ public static function getSearch( $name, $id, $location = '' ) public static function getTemplateStyle( $id, $params = array() ) { if ( ! $id ) { - return; + return true; } static $cache = array(); diff --git a/libraries/cck/construction/field/cck.php b/libraries/cck/construction/field/cck.php index 276914593..da96f3b44 100644 --- a/libraries/cck/construction/field/cck.php +++ b/libraries/cck/construction/field/cck.php @@ -32,7 +32,7 @@ protected function getInput() $selectlabel = isset( $this->element['cck_selectlabel'] ) ? (string)$this->element['cck_selectlabel'] : 'undefined'; if ( ! $name ) { - return; + return true; } $format = (string)$this->element['js_format']; @@ -58,7 +58,7 @@ protected function getInput() $field = JCckDevField::getObject( $name ); if ( ! $field ) { - return; + return true; } $storage_field = $field->storage_field; $field->storage_field = $this->name; @@ -180,8 +180,8 @@ protected function _addScripts( $id, $events, $format ) $doc->addScriptDeclaration( $js ); } } - - return; + + return true; } } ?> \ No newline at end of file diff --git a/libraries/cck/construction/field/cckjs.php b/libraries/cck/construction/field/cckjs.php index a88c4665d..3c2a4838b 100644 --- a/libraries/cck/construction/field/cckjs.php +++ b/libraries/cck/construction/field/cckjs.php @@ -134,8 +134,8 @@ protected function _addScripts( $id, $events, $format ) $doc->addScriptDeclaration( $js ); } } - - return; + + return true; } } ?> \ No newline at end of file diff --git a/libraries/cck/construction/field/cckpicker.php b/libraries/cck/construction/field/cckpicker.php index 90f63aa69..a824066b5 100644 --- a/libraries/cck/construction/field/cckpicker.php +++ b/libraries/cck/construction/field/cckpicker.php @@ -55,7 +55,7 @@ protected function getInput() $field = JCckDevField::getObject( $name ); if ( ! $field ) { - return; + return true; } $storage_field = $field->storage_field; $field->storage_field = $this->name; @@ -120,8 +120,8 @@ protected function _addScripts( $id, $params, $format ) if ( $css ) { $doc->addStyleDeclaration( $css ); } - - return; + + return true; } } ?> \ No newline at end of file diff --git a/libraries/cck/content/content.php b/libraries/cck/content/content.php index fa193208c..cd9f65c1a 100644 --- a/libraries/cck/content/content.php +++ b/libraries/cck/content/content.php @@ -100,7 +100,7 @@ public static function getValues( $text, $fieldnames = '' ) public static function prepare( &$row = null, $name = 'description', $params = null ) { if ( $row === null ) { - return; + return true; } if ( $params === null ) { $params = new JObject; diff --git a/libraries/cck/development/plugins/plg_cck_field/%name%.php b/libraries/cck/development/plugins/plg_cck_field/%name%.php index ef55739c9..8f3794bae 100644 --- a/libraries/cck/development/plugins/plg_cck_field/%name%.php +++ b/libraries/cck/development/plugins/plg_cck_field/%name%.php @@ -45,7 +45,7 @@ public function onCCK_FieldPrepareContent( &$field, $value = '', &$config = arra public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); @@ -97,7 +97,7 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Prepare @@ -113,7 +113,7 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Init diff --git a/libraries/cck/development/plugins/plg_cck_field_restriction/%name%.php b/libraries/cck/development/plugins/plg_cck_field_restriction/%name%.php index 763ccefd9..8f4168a5a 100644 --- a/libraries/cck/development/plugins/plg_cck_field_restriction/%name%.php +++ b/libraries/cck/development/plugins/plg_cck_field_restriction/%name%.php @@ -21,7 +21,7 @@ class plgCCK_Field_Restriction%class% extends JCckPluginRestriction public static function onCCK_Field_RestrictionPrepareContent( &$field, &$config ) { if ( self::$type != $field->restriction ) { - return; + return true; } $restriction = parent::g_getRestriction( $field->restriction_options ); @@ -33,7 +33,7 @@ public static function onCCK_Field_RestrictionPrepareContent( &$field, &$config public static function onCCK_Field_RestrictionPrepareForm( &$field, &$config ) { if ( self::$type != $field->restriction ) { - return; + return true; } $restriction = parent::g_getRestriction( $field->restriction_options ); @@ -45,7 +45,7 @@ public static function onCCK_Field_RestrictionPrepareForm( &$field, &$config ) public static function onCCK_Field_RestrictionPrepareStore( &$field, &$config ) { if ( self::$type != $field->restriction ) { - return; + return true; } $restriction = parent::g_getRestriction( $field->restriction_options ); 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..b157718ab 100644 --- a/libraries/cck/development/plugins/plg_cck_storage_location/%name%.php +++ b/libraries/cck/development/plugins/plg_cck_storage_location/%name%.php @@ -185,7 +185,7 @@ public static function onCCK_Storage_LocationDelete( $pk, &$config = array() ) public function onCCK_Storage_LocationStore( $type, $data, &$config = array(), $pk = 0 ) { if ( self::$type != $type ) { - return; + return true; } if ( ! @$config['storages'][self::$table]['_']->pk ) { diff --git a/libraries/cck/rendering/rendering.php b/libraries/cck/rendering/rendering.php index caf0f9532..614d7956f 100644 --- a/libraries/cck/rendering/rendering.php +++ b/libraries/cck/rendering/rendering.php @@ -77,7 +77,7 @@ public function __call( $method, $args ) $property = strtolower( substr( $method, 3 ) ); if ( empty( $prefix ) ) { - return; + return true; } if ( $prefix == 'get' ) { @@ -484,7 +484,7 @@ public function doExist( $fieldname = '' ) public function getLabel( $fieldname = '', $html = false, $suffix = '' ) { if ( ! isset ( $this->me[$fieldname] ) ) { - return; + return true; } $label = trim( $this->me[$fieldname]->label ); @@ -781,8 +781,8 @@ protected function renderPos( $pos = '' ) include $pos; return ob_get_clean(); } - - return; + + return true; } // renderPosition diff --git a/libraries/cck/rendering/rendering_item.php b/libraries/cck/rendering/rendering_item.php index 2ac678f35..6b3142786 100644 --- a/libraries/cck/rendering/rendering_item.php +++ b/libraries/cck/rendering/rendering_item.php @@ -53,7 +53,7 @@ public function __call( $method, $args ) $property = strtolower( substr( $method, 3 ) ); if ( empty( $prefix ) ) { - return; + return true; } if ( $prefix == 'get' ) { @@ -162,7 +162,7 @@ public function getFields( $position = '', $type = '', $prepare = true ) public function getLabel( $fieldname = '', $html = false, $suffix = '' ) { if ( ! isset ( $this->me[$fieldname] ) ) { - return; + return true; } $label = trim( $this->me[$fieldname]->label ); @@ -261,8 +261,8 @@ protected function renderPos( $pos = '' ) include $pos; return ob_get_clean(); } - - return; + + return true; } // renderPosition diff --git a/libraries/cms/cck/content.php b/libraries/cms/cck/content.php index bfeb1a53a..430e20dd9 100644 --- a/libraries/cms/cck/content.php +++ b/libraries/cms/cck/content.php @@ -90,7 +90,7 @@ protected function getInstanceBase() public function create( $cck, $data_content, $data_more = null, $data_more2 = null ) { if ( $this->_id ) { - return; + return true; } $this->_type = $cck; @@ -101,7 +101,7 @@ public function create( $cck, $data_content, $data_more = null, $data_more2 = nu $this->_table = $this->_columns['table']; if ( !$this->_object ) { - return; + return true; } } @@ -271,7 +271,7 @@ public function load( $identifier, $data = true ) $this->_instance_base = $this->getInstanceBase(); if( !isset( $identifier[1] ) ) { - return; + return true; } $core = JCckDatabase::loadObject( 'SELECT id, cck, pk, storage_location FROM #__cck_core WHERE storage_location = "'.(string)$identifier[0].'" AND pk = '.(int)$identifier[1] ); @@ -292,7 +292,7 @@ public function load( $identifier, $data = true ) $this->_instance_base->load( $this->_pk ); if ( !$this->_columns['table'] ) { - return; + return true; } $this->_table = $this->_columns['table']; diff --git a/libraries/cms/cck/dev.php b/libraries/cms/cck/dev.php index bea6d6f04..03fe2468e 100644 --- a/libraries/cms/cck/dev.php +++ b/libraries/cms/cck/dev.php @@ -583,7 +583,7 @@ public static function renderBlank( $html = '', $label = '' ) $app = JFactory::getApplication(); if ( $app->input->get( 'option' ) == 'com_cck' && $app->input->get( 'view' ) == 'form' ) { - return; + return true; } return '
  • '.$html.'
    • '; @@ -593,14 +593,14 @@ public static function renderBlank( $html = '', $label = '' ) public static function renderHelp( $type, $url = '' ) { if ( !$url ) { - return; + return true; } $app = JFactory::getApplication(); $raw = false; if ( $app->input->get( 'option' ) == 'com_cck' && $app->input->get( 'view' ) == 'form' ) { - return; + return true; } switch ( $type ) { @@ -637,7 +637,7 @@ public static function renderLegend( $legend, $tooltip = '', $tag = '1' ) $app = JFactory::getApplication(); if ( $app->input->get( 'option' ) == 'com_cck' && $app->input->get( 'view' ) == 'form' ) { - return; + return true; } if ( $tooltip != '' ) { @@ -657,7 +657,7 @@ public static function renderSpacer( $legend, $tooltip = '', $tag = '2', $option $app = JFactory::getApplication(); if ( $app->input->get( 'option' ) == 'com_cck' && $app->input->get( 'view' ) == 'form' ) { - return; + return true; } if ( isset( $app->cck_markup_closed ) && $app->cck_markup_closed === true ) { diff --git a/libraries/cms/cck/dev/field.php b/libraries/cms/cck/dev/field.php index 9672a2e76..c56df2f5e 100644 --- a/libraries/cms/cck/dev/field.php +++ b/libraries/cms/cck/dev/field.php @@ -21,7 +21,7 @@ public static function get( $field, $value, &$config = array( 'doTranslation'=>1 if ( ! is_object( $field ) ) { $field = JCckDatabase::loadObject( 'SELECT a.* FROM #__cck_core_fields AS a WHERE a.name = "'.$field.'"' ); //# if ( ! $field ) { - return; + return true; } } $field->required_alert = ''; @@ -94,7 +94,7 @@ public static function getForm( $field, $value, &$config = array( 'doTranslation if ( ! is_object( $field ) ) { $field = JCckDatabase::loadObject( 'SELECT a.* FROM #__cck_core_fields AS a WHERE a.name = "'.$field.'"' ); //# if ( ! $field ) { - return; + return true; } } $field->required_alert = ''; @@ -165,7 +165,7 @@ public static function renderContent( $field, $value = '', &$config = array( 'do if ( ! is_object( $field ) ) { $field = JCckDatabase::loadObject( 'SELECT a.* FROM #__cck_core_fields AS a WHERE a.name = "'.$field.'"' ); //# if ( ! $field ) { - return; + return true; } } diff --git a/libraries/cms/cck/dev/image.php b/libraries/cms/cck/dev/image.php index 3dbe9e267..199c3c884 100644 --- a/libraries/cms/cck/dev/image.php +++ b/libraries/cms/cck/dev/image.php @@ -52,7 +52,7 @@ public function __call( $method, $args ) $property = strtolower( substr( $method, 3 ) ); if ( empty( $prefix ) ) { - return; + return true; } if ( $prefix == 'get' ) { diff --git a/libraries/cms/cck/ecommerce/promotion.php b/libraries/cms/cck/ecommerce/promotion.php index 84e0be6e9..411d24671 100644 --- a/libraries/cms/cck/ecommerce/promotion.php +++ b/libraries/cms/cck/ecommerce/promotion.php @@ -170,6 +170,7 @@ public static function apply( $type, &$total, $items, $params = array() ) 'title'=>$p->title, 'type'=>$p->type ); + break; default: break; } diff --git a/libraries/cms/cck/field.php b/libraries/cms/cck/field.php index 1bfc87a2a..8b2adce01 100644 --- a/libraries/cms/cck/field.php +++ b/libraries/cms/cck/field.php @@ -33,7 +33,7 @@ public function __call( $method, $args ) $property = strtolower( substr( $method, 3 ) ); if ( empty( $prefix ) ) { - return; + return true; } if ( $prefix == 'get' ) { @@ -45,7 +45,7 @@ public function __call( $method, $args ) public static function getInstance( $name = '', $config = array( 'doTranslation'=>1, 'doValidation'=>2, 'mode'=>'content' ) ) { if ( !$name ) { - return; + return true; } if ( empty( self::$instances[$name] ) ) { diff --git a/libraries/cms/cck/installer/script/app.php b/libraries/cms/cck/installer/script/app.php index 39c5390fb..e9e7ff301 100644 --- a/libraries/cms/cck/installer/script/app.php +++ b/libraries/cms/cck/installer/script/app.php @@ -70,11 +70,11 @@ function postflight( $type, $parent ) function postInstallMessage( $event, $pk = 0 ) { if ( !( property_exists( $this, 'template_placeholder' ) && $this->template_placeholder != '' ) ) { - return; + return true; } if ( !version_compare( JVERSION, '3.2', 'ge' ) ) { - return; + return true; } if ( !$pk ) { $db = JFactory::getDbo(); diff --git a/libraries/cms/cck/installer/script/component.php b/libraries/cms/cck/installer/script/component.php index 05d7cbecd..86192299f 100644 --- a/libraries/cms/cck/installer/script/component.php +++ b/libraries/cms/cck/installer/script/component.php @@ -54,7 +54,7 @@ function postflight( $type, $parent ) function postInstallMessage( $event, $pk = 0 ) { if ( !version_compare( JVERSION, '3.2', 'ge' ) ) { - return; + return true; } if ( !$pk ) { $db = JFactory::getDbo(); @@ -68,7 +68,7 @@ function postInstallMessage( $event, $pk = 0 ) } if ( !( is_object( $this->cck ) && isset( $this->cck->element ) && $this->cck->element != '' ) ) { - return; + return true; } $lang = JFactory::getLanguage(); diff --git a/libraries/cms/cck/plugin/location.php b/libraries/cms/cck/plugin/location.php index a72fe190b..b81e16792 100644 --- a/libraries/cms/cck/plugin/location.php +++ b/libraries/cms/cck/plugin/location.php @@ -83,7 +83,7 @@ public static function onCCK_Storage_LocationSaveOrder( $pks = array(), $order = $conditions = array(); if ( empty( $pks ) ) { - return; + return true; } foreach ( $pks as $i=>$pk ) { diff --git a/libraries/cms/cck/webservice.php b/libraries/cms/cck/webservice.php index ee653b371..4b705767e 100644 --- a/libraries/cms/cck/webservice.php +++ b/libraries/cms/cck/webservice.php @@ -68,7 +68,7 @@ public static function call( $name, $data = array(), $fields = array() ) . ' LEFT JOIN #__cck_more_webservices AS b ON b.id = a.webservice' . ' WHERE a.name = "'.$name.'"' ); if ( !is_object( $webservice ) ) { - return; + return true; } $allowed = array( 'request'=>'', diff --git a/plugins/cck_field/42/42.php b/plugins/cck_field/42/42.php index 54ddef135..8473f6a1f 100644 --- a/plugins/cck_field/42/42.php +++ b/plugins/cck_field/42/42.php @@ -51,7 +51,7 @@ public function onCCK_FieldPrepareContent( &$field, $value = '', &$config = arra public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); @@ -106,7 +106,7 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Prepare @@ -122,7 +122,7 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Init diff --git a/plugins/cck_field/button_free/button_free.php b/plugins/cck_field/button_free/button_free.php index 97d4748ff..bb5e11a62 100644 --- a/plugins/cck_field/button_free/button_free.php +++ b/plugins/cck_field/button_free/button_free.php @@ -180,7 +180,7 @@ public function onCCK_FieldPrepareContent( &$field, $value = '', &$config = arra public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); $field->label2 = trim( @$field->label2 ); @@ -310,7 +310,7 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Prepare diff --git a/plugins/cck_field/button_submit/button_submit.php b/plugins/cck_field/button_submit/button_submit.php index 0542c8d27..ea4e736a5 100644 --- a/plugins/cck_field/button_submit/button_submit.php +++ b/plugins/cck_field/button_submit/button_submit.php @@ -168,7 +168,7 @@ public function onCCK_FieldPrepareContent( &$field, $value = '', &$config = arra public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); $field->label2 = trim( @$field->label2 ); @@ -318,7 +318,7 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Prepare diff --git a/plugins/cck_field/calendar/calendar.php b/plugins/cck_field/calendar/calendar.php index 4df8fb1ef..ff7ecdac1 100644 --- a/plugins/cck_field/calendar/calendar.php +++ b/plugins/cck_field/calendar/calendar.php @@ -72,7 +72,7 @@ public function onCCK_FieldPrepareContent( &$field, $value = '', &$config = arra public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); @@ -171,7 +171,7 @@ public function onCCK_FieldPrepareResource( &$field, $value = '', &$config = arr public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); @@ -263,7 +263,7 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Init diff --git a/plugins/cck_field/checkbox/checkbox.php b/plugins/cck_field/checkbox/checkbox.php index ae37f473e..5158a9e46 100644 --- a/plugins/cck_field/checkbox/checkbox.php +++ b/plugins/cck_field/checkbox/checkbox.php @@ -87,7 +87,7 @@ public function onCCK_FieldPrepareExport( &$field, $value = '', &$config = array public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); @@ -282,7 +282,7 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Init @@ -309,7 +309,7 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Init diff --git a/plugins/cck_field/colorpicker/colorpicker.php b/plugins/cck_field/colorpicker/colorpicker.php index 2e379c2d7..043ea7b74 100644 --- a/plugins/cck_field/colorpicker/colorpicker.php +++ b/plugins/cck_field/colorpicker/colorpicker.php @@ -46,7 +46,7 @@ public function onCCK_FieldPrepareContent( &$field, $value = '', &$config = arra public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); @@ -94,7 +94,7 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Prepare @@ -110,7 +110,7 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Init diff --git a/plugins/cck_field/div/div.php b/plugins/cck_field/div/div.php index f2ec4a222..d27607b5c 100644 --- a/plugins/cck_field/div/div.php +++ b/plugins/cck_field/div/div.php @@ -110,7 +110,7 @@ public function onCCK_FieldPrepareContent( &$field, $value = '', &$config = arra public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); @@ -154,7 +154,7 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Prepare diff --git a/plugins/cck_field/email/email.php b/plugins/cck_field/email/email.php index c6d383dc9..f13d977b8 100644 --- a/plugins/cck_field/email/email.php +++ b/plugins/cck_field/email/email.php @@ -44,7 +44,7 @@ public function onCCK_FieldPrepareContent( &$field, $value = '', &$config = arra public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); @@ -97,7 +97,7 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Prepare @@ -113,7 +113,7 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Init diff --git a/plugins/cck_field/field_x/field_x.php b/plugins/cck_field/field_x/field_x.php index cb30e3cc1..1bfe42dcf 100644 --- a/plugins/cck_field/field_x/field_x.php +++ b/plugins/cck_field/field_x/field_x.php @@ -103,7 +103,7 @@ public function onCCK_FieldDelete( &$field, $value = '', &$config = array() ) public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); @@ -169,7 +169,7 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Prepare diff --git a/plugins/cck_field/freetext/freetext.php b/plugins/cck_field/freetext/freetext.php index 1c25f7d33..91a353ee1 100644 --- a/plugins/cck_field/freetext/freetext.php +++ b/plugins/cck_field/freetext/freetext.php @@ -64,7 +64,7 @@ public function onCCK_FieldPrepareContent( &$field, $value = '', &$config = arra public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); @@ -114,7 +114,7 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Prepare diff --git a/plugins/cck_field/group/group.php b/plugins/cck_field/group/group.php index 0e185f457..13b2e3f98 100644 --- a/plugins/cck_field/group/group.php +++ b/plugins/cck_field/group/group.php @@ -166,7 +166,7 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Prepare diff --git a/plugins/cck_field/group_x/group_x.php b/plugins/cck_field/group_x/group_x.php index 712ab0d2d..68a9067b7 100644 --- a/plugins/cck_field/group_x/group_x.php +++ b/plugins/cck_field/group_x/group_x.php @@ -232,7 +232,7 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Prepare diff --git a/plugins/cck_field/hidden/hidden.php b/plugins/cck_field/hidden/hidden.php index 987335f97..f0338403e 100644 --- a/plugins/cck_field/hidden/hidden.php +++ b/plugins/cck_field/hidden/hidden.php @@ -45,7 +45,7 @@ public function onCCK_FieldPrepareContent( &$field, $value = '', &$config = arra public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); @@ -89,7 +89,7 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Prepare @@ -105,7 +105,7 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Init diff --git a/plugins/cck_field/jform_accesslevel/jform_accesslevel.php b/plugins/cck_field/jform_accesslevel/jform_accesslevel.php index 13505f013..5cf241cee 100644 --- a/plugins/cck_field/jform_accesslevel/jform_accesslevel.php +++ b/plugins/cck_field/jform_accesslevel/jform_accesslevel.php @@ -50,7 +50,7 @@ public function onCCK_FieldPrepareContent( &$field, $value = '', &$config = arra public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); @@ -127,7 +127,7 @@ class="'.$class.'" public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Prepare @@ -147,7 +147,7 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Init diff --git a/plugins/cck_field/jform_associations/jform_associations.php b/plugins/cck_field/jform_associations/jform_associations.php index e605dc0f5..78a8c19e3 100644 --- a/plugins/cck_field/jform_associations/jform_associations.php +++ b/plugins/cck_field/jform_associations/jform_associations.php @@ -45,7 +45,7 @@ public function onCCK_FieldPrepareContent( &$field, $value = '', &$config = arra public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); @@ -106,7 +106,7 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Prepare @@ -122,7 +122,7 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Init diff --git a/plugins/cck_field/jform_category/jform_category.php b/plugins/cck_field/jform_category/jform_category.php index 658d3fb56..b14f3b522 100644 --- a/plugins/cck_field/jform_category/jform_category.php +++ b/plugins/cck_field/jform_category/jform_category.php @@ -80,7 +80,7 @@ public function onCCK_FieldPrepareExport( &$field, $value = '', &$config = array public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); @@ -184,7 +184,7 @@ class="'.$class.'"'.$size.' public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Prepare @@ -204,7 +204,7 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Init diff --git a/plugins/cck_field/jform_componentlayout/jform_componentlayout.php b/plugins/cck_field/jform_componentlayout/jform_componentlayout.php index f52f80e98..92795f8cc 100644 --- a/plugins/cck_field/jform_componentlayout/jform_componentlayout.php +++ b/plugins/cck_field/jform_componentlayout/jform_componentlayout.php @@ -46,7 +46,7 @@ public function onCCK_FieldPrepareContent( &$field, $value = '', &$config = arra public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); diff --git a/plugins/cck_field/jform_contentlanguage/jform_contentlanguage.php b/plugins/cck_field/jform_contentlanguage/jform_contentlanguage.php index 7e7ed0f88..20f653984 100644 --- a/plugins/cck_field/jform_contentlanguage/jform_contentlanguage.php +++ b/plugins/cck_field/jform_contentlanguage/jform_contentlanguage.php @@ -46,7 +46,7 @@ public function onCCK_FieldPrepareContent( &$field, $value = '', &$config = arra public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); diff --git a/plugins/cck_field/jform_editors/jform_editors.php b/plugins/cck_field/jform_editors/jform_editors.php index c28fbaa42..1e9ed128a 100644 --- a/plugins/cck_field/jform_editors/jform_editors.php +++ b/plugins/cck_field/jform_editors/jform_editors.php @@ -46,7 +46,7 @@ public function onCCK_FieldPrepareContent( &$field, $value = '', &$config = arra public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); @@ -125,7 +125,7 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Init diff --git a/plugins/cck_field/jform_groupparent/jform_groupparent.php b/plugins/cck_field/jform_groupparent/jform_groupparent.php index 2c3294fa2..fe07aee91 100644 --- a/plugins/cck_field/jform_groupparent/jform_groupparent.php +++ b/plugins/cck_field/jform_groupparent/jform_groupparent.php @@ -48,7 +48,7 @@ public function onCCK_FieldPrepareContent( &$field, $value = '', &$config = arra public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); @@ -113,7 +113,7 @@ class="'.$class.'" public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Prepare diff --git a/plugins/cck_field/jform_helpsite/jform_helpsite.php b/plugins/cck_field/jform_helpsite/jform_helpsite.php index 010bf650e..27c6095ba 100644 --- a/plugins/cck_field/jform_helpsite/jform_helpsite.php +++ b/plugins/cck_field/jform_helpsite/jform_helpsite.php @@ -46,7 +46,7 @@ public function onCCK_FieldPrepareContent( &$field, $value = '', &$config = arra public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); @@ -106,7 +106,7 @@ class="'.$class.'" public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Prepare @@ -122,7 +122,7 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Init diff --git a/plugins/cck_field/jform_media/jform_media.php b/plugins/cck_field/jform_media/jform_media.php index 8a7dcb3cb..6387b84bd 100644 --- a/plugins/cck_field/jform_media/jform_media.php +++ b/plugins/cck_field/jform_media/jform_media.php @@ -45,7 +45,7 @@ public function onCCK_FieldPrepareContent( &$field, $value = '', &$config = arra public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); @@ -106,7 +106,7 @@ class="'.$class.'" public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Prepare @@ -122,7 +122,7 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Init diff --git a/plugins/cck_field/jform_menuitem/jform_menuitem.php b/plugins/cck_field/jform_menuitem/jform_menuitem.php index 7dd64899b..6e0546bd7 100644 --- a/plugins/cck_field/jform_menuitem/jform_menuitem.php +++ b/plugins/cck_field/jform_menuitem/jform_menuitem.php @@ -68,7 +68,7 @@ public function onCCK_FieldPrepareContent( &$field, $value = '', &$config = arra public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); @@ -167,7 +167,7 @@ class="'.$class.'" public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Prepare @@ -183,7 +183,7 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Init diff --git a/plugins/cck_field/jform_rules/jform_rules.php b/plugins/cck_field/jform_rules/jform_rules.php index 6f6a7d4fa..d05dd58c0 100644 --- a/plugins/cck_field/jform_rules/jform_rules.php +++ b/plugins/cck_field/jform_rules/jform_rules.php @@ -46,7 +46,7 @@ public function onCCK_FieldPrepareContent( &$field, $value = '', &$config = arra public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); @@ -147,7 +147,7 @@ class="readonly" public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Prepare @@ -163,7 +163,7 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Init diff --git a/plugins/cck_field/jform_tag/jform_tag.php b/plugins/cck_field/jform_tag/jform_tag.php index c8da2d5b3..e67622655 100644 --- a/plugins/cck_field/jform_tag/jform_tag.php +++ b/plugins/cck_field/jform_tag/jform_tag.php @@ -69,7 +69,7 @@ public function onCCK_FieldPrepareContent( &$field, $value = '', &$config = arra public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); @@ -148,7 +148,7 @@ class="'.$class.'" public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Prepare @@ -199,7 +199,7 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Init diff --git a/plugins/cck_field/jform_templatestyle/jform_templatestyle.php b/plugins/cck_field/jform_templatestyle/jform_templatestyle.php index c97920b12..26e1990e6 100644 --- a/plugins/cck_field/jform_templatestyle/jform_templatestyle.php +++ b/plugins/cck_field/jform_templatestyle/jform_templatestyle.php @@ -46,7 +46,7 @@ public function onCCK_FieldPrepareContent( &$field, $value = '', &$config = arra public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); @@ -110,7 +110,7 @@ class="'.$class.'" public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Prepare @@ -126,7 +126,7 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Init diff --git a/plugins/cck_field/jform_timezone/jform_timezone.php b/plugins/cck_field/jform_timezone/jform_timezone.php index 3129625a0..87e4225b0 100644 --- a/plugins/cck_field/jform_timezone/jform_timezone.php +++ b/plugins/cck_field/jform_timezone/jform_timezone.php @@ -46,7 +46,7 @@ public function onCCK_FieldPrepareContent( &$field, $value = '', &$config = arra public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); @@ -108,7 +108,7 @@ class="'.$class.'" public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Prepare diff --git a/plugins/cck_field/jform_user/jform_user.php b/plugins/cck_field/jform_user/jform_user.php index 9fecea44c..d52041e90 100644 --- a/plugins/cck_field/jform_user/jform_user.php +++ b/plugins/cck_field/jform_user/jform_user.php @@ -59,7 +59,7 @@ public function onCCK_FieldPrepareExport( &$field, $value = '', &$config = array public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); @@ -140,7 +140,7 @@ class="'.$class.'" public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Prepare @@ -156,7 +156,7 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Init diff --git a/plugins/cck_field/jform_usergroups/jform_usergroups.php b/plugins/cck_field/jform_usergroups/jform_usergroups.php index ff4204565..e7e13f61b 100644 --- a/plugins/cck_field/jform_usergroups/jform_usergroups.php +++ b/plugins/cck_field/jform_usergroups/jform_usergroups.php @@ -59,7 +59,7 @@ public function onCCK_FieldPrepareContent( &$field, $value = '', &$config = arra public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); @@ -129,7 +129,7 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Prepare @@ -187,7 +187,7 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Init diff --git a/plugins/cck_field/joomla_module/joomla_module.php b/plugins/cck_field/joomla_module/joomla_module.php index 2cbd4892e..bbda1d89d 100644 --- a/plugins/cck_field/joomla_module/joomla_module.php +++ b/plugins/cck_field/joomla_module/joomla_module.php @@ -101,7 +101,7 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Prepare diff --git a/plugins/cck_field/link/link.php b/plugins/cck_field/link/link.php index b340e411f..ca320c905 100644 --- a/plugins/cck_field/link/link.php +++ b/plugins/cck_field/link/link.php @@ -97,7 +97,7 @@ public function onCCK_FieldPrepareExport( &$field, $value = '', &$config = array public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); @@ -205,7 +205,7 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Prepare @@ -221,7 +221,7 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Init diff --git a/plugins/cck_field/password/password.php b/plugins/cck_field/password/password.php index 8ccaaf419..f870c3eba 100644 --- a/plugins/cck_field/password/password.php +++ b/plugins/cck_field/password/password.php @@ -44,7 +44,7 @@ public function onCCK_FieldPrepareContent( &$field, $value = '', &$config = arra public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); @@ -96,7 +96,7 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Prepare @@ -112,7 +112,7 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Init diff --git a/plugins/cck_field/radio/radio.php b/plugins/cck_field/radio/radio.php index 71210a153..ec8d9e6aa 100644 --- a/plugins/cck_field/radio/radio.php +++ b/plugins/cck_field/radio/radio.php @@ -73,7 +73,7 @@ public function onCCK_FieldPrepareExport( &$field, $value = '', &$config = array public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); @@ -223,7 +223,7 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Prepare @@ -243,7 +243,7 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Init diff --git a/plugins/cck_field/search_generic/search_generic.php b/plugins/cck_field/search_generic/search_generic.php index d291b24bf..624c1e930 100644 --- a/plugins/cck_field/search_generic/search_generic.php +++ b/plugins/cck_field/search_generic/search_generic.php @@ -45,7 +45,7 @@ public function onCCK_FieldPrepareContent( &$field, $value = '', &$config = arra public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); @@ -113,7 +113,7 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Prepare @@ -143,7 +143,7 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Init diff --git a/plugins/cck_field/search_ordering/search_ordering.php b/plugins/cck_field/search_ordering/search_ordering.php index e53ae8ec8..d62a00e0c 100644 --- a/plugins/cck_field/search_ordering/search_ordering.php +++ b/plugins/cck_field/search_ordering/search_ordering.php @@ -63,7 +63,7 @@ public function onCCK_FieldPrepareContent( &$field, $value = '', &$config = arra public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); @@ -139,7 +139,7 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Prepare @@ -211,7 +211,7 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Init diff --git a/plugins/cck_field/select_dynamic/select_dynamic.php b/plugins/cck_field/select_dynamic/select_dynamic.php index b14458182..0eb8b43a5 100644 --- a/plugins/cck_field/select_dynamic/select_dynamic.php +++ b/plugins/cck_field/select_dynamic/select_dynamic.php @@ -148,7 +148,7 @@ public function onCCK_FieldPrepareExport( &$field, $value = '', &$config = array public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); @@ -491,7 +491,7 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Init @@ -521,7 +521,7 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Init diff --git a/plugins/cck_field/select_multiple/select_multiple.php b/plugins/cck_field/select_multiple/select_multiple.php index fe9b646a6..64cbcf67d 100644 --- a/plugins/cck_field/select_multiple/select_multiple.php +++ b/plugins/cck_field/select_multiple/select_multiple.php @@ -75,7 +75,7 @@ public function onCCK_FieldPrepareContent( &$field, $value = '', &$config = arra public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); @@ -204,7 +204,7 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Init @@ -231,7 +231,7 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Init diff --git a/plugins/cck_field/select_numeric/select_numeric.php b/plugins/cck_field/select_numeric/select_numeric.php index cda20cf04..c981432f0 100644 --- a/plugins/cck_field/select_numeric/select_numeric.php +++ b/plugins/cck_field/select_numeric/select_numeric.php @@ -46,7 +46,7 @@ public function onCCK_FieldPrepareContent( &$field, $value = '', &$config = arra public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); @@ -100,7 +100,7 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Prepare @@ -120,7 +120,7 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Init diff --git a/plugins/cck_field/select_simple/select_simple.php b/plugins/cck_field/select_simple/select_simple.php index 6ef8af43b..4e490892b 100644 --- a/plugins/cck_field/select_simple/select_simple.php +++ b/plugins/cck_field/select_simple/select_simple.php @@ -95,7 +95,7 @@ public function onCCK_FieldPrepareExport( &$field, $value = '', &$config = array public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); @@ -312,7 +312,7 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Prepare @@ -332,7 +332,7 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Init diff --git a/plugins/cck_field/storage/storage.php b/plugins/cck_field/storage/storage.php index 30b5c64c4..0f2a9184f 100644 --- a/plugins/cck_field/storage/storage.php +++ b/plugins/cck_field/storage/storage.php @@ -44,7 +44,7 @@ public function onCCK_FieldPrepareContent( &$field, $value = '', &$config = arra public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); diff --git a/plugins/cck_field/tabs/tabs.php b/plugins/cck_field/tabs/tabs.php index b44485da1..0c835edf6 100644 --- a/plugins/cck_field/tabs/tabs.php +++ b/plugins/cck_field/tabs/tabs.php @@ -100,7 +100,7 @@ public function onCCK_FieldPrepareContent( &$field, $value = '', &$config = arra public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); @@ -136,7 +136,7 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Prepare diff --git a/plugins/cck_field/text/text.php b/plugins/cck_field/text/text.php index 49fb828d0..db0007401 100644 --- a/plugins/cck_field/text/text.php +++ b/plugins/cck_field/text/text.php @@ -85,7 +85,7 @@ public function onCCK_FieldPrepareContent( &$field, $value = '', &$config = arra public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); @@ -152,7 +152,7 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Prepare @@ -171,7 +171,7 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Init diff --git a/plugins/cck_field/textarea/textarea.php b/plugins/cck_field/textarea/textarea.php index 602471fc5..e5f55db37 100644 --- a/plugins/cck_field/textarea/textarea.php +++ b/plugins/cck_field/textarea/textarea.php @@ -61,7 +61,7 @@ public function onCCK_FieldPrepareExport( &$field, $value = '', &$config = array public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); @@ -120,7 +120,7 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Prepare @@ -136,7 +136,7 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Init diff --git a/plugins/cck_field/upload_file/upload_file.php b/plugins/cck_field/upload_file/upload_file.php index dda3497fb..a24a74036 100644 --- a/plugins/cck_field/upload_file/upload_file.php +++ b/plugins/cck_field/upload_file/upload_file.php @@ -59,12 +59,12 @@ public static function onCCK_FieldConstruct_SearchSearch( &$field, $style, $data public function onCCK_FieldDelete( &$field, $value = '', &$config = array() ) { if ( self::$type != $field->type ) { - return; + return true; } $value_json = JCckDev::fromJSON( $value ); if ( $value == '' || isset( $value_json['file_location'] ) && $value_json['file_location'] == '' ) { - return; + return true; } // Init @@ -395,7 +395,7 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } parent::g_onCCK_FieldPrepareSearch( $field, $config ); @@ -431,7 +431,7 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Init @@ -662,7 +662,7 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array( // Validate parent::g_onCCK_FieldPrepareStore_Validation( $field, $name, $value, $config ); if ( isset( $field->error ) && $field->error === true ) { - return; + return true; } $item_custom_title = addcslashes( $item_custom_title, '"' ); diff --git a/plugins/cck_field/upload_image/upload_image.php b/plugins/cck_field/upload_image/upload_image.php index 903fd9653..ce15feaf5 100644 --- a/plugins/cck_field/upload_image/upload_image.php +++ b/plugins/cck_field/upload_image/upload_image.php @@ -59,12 +59,12 @@ public static function onCCK_FieldConstruct_SearchSearch( &$field, $style, $data public function onCCK_FieldDelete( &$field, $value = '', &$config = array() ) { if ( self::$type != $field->type ) { - return; + return true; } $value_json = JCckDev::fromJSON( $value ); if ( $value == '' || isset( $value_json['image_location'] ) && $value_json['image_location'] == '' ) { - return; + return true; } // Init @@ -112,7 +112,7 @@ public function onCCK_FieldDelete( &$field, $value = '', &$config = array() ) public function onCCK_FieldPrepareContent( &$field, $value = '', &$config = array() ) { if ( self::$type != $field->type ) { - return; + return true; } parent::g_onCCK_FieldPrepareContent( $field, $config ); @@ -167,7 +167,7 @@ public function onCCK_FieldPrepareContent( &$field, $value = '', &$config = arra public function onCCK_FieldPrepareDownload( &$field, $value = '', &$config = array() ) { if ( self::$type != $field->type ) { - return; + return true; } // Prepare @@ -190,7 +190,7 @@ public function onCCK_FieldPrepareDownload( &$field, $value = '', &$config = arr public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); @@ -463,7 +463,7 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Init @@ -667,7 +667,7 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array( // Validate parent::g_onCCK_FieldPrepareStore_Validation( $field, $name, $value, $config ); if ( isset( $field->error ) && $field->error === true ) { - return; + return true; } $imageTitle = ( $imageTitle ) ? addcslashes( $imageTitle, '"' ) : ''; $imageDesc = ( $imageDesc ) ? addcslashes( $imageDesc, '"' ) : ''; diff --git a/plugins/cck_field/wysiwyg_editor/wysiwyg_editor.php b/plugins/cck_field/wysiwyg_editor/wysiwyg_editor.php index bbf723b4f..8fa8e460b 100644 --- a/plugins/cck_field/wysiwyg_editor/wysiwyg_editor.php +++ b/plugins/cck_field/wysiwyg_editor/wysiwyg_editor.php @@ -58,7 +58,7 @@ public function onCCK_FieldPrepareExport( &$field, $value = '', &$config = array public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } self::$path = parent::g_getPath( self::$type.'/' ); parent::g_onCCK_FieldPrepareForm( $field, $config ); @@ -161,7 +161,7 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array() public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Init @@ -184,7 +184,7 @@ public function onCCK_FieldPrepareSearch( &$field, $value = '', &$config = array public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array(), $inherit = array(), $return = false ) { if ( self::$type != $field->type ) { - return; + return true; } // Init diff --git a/plugins/cck_field_restriction/cck_workflow/cck_workflow.php b/plugins/cck_field_restriction/cck_workflow/cck_workflow.php index 785d43f8d..2f99b402d 100644 --- a/plugins/cck_field_restriction/cck_workflow/cck_workflow.php +++ b/plugins/cck_field_restriction/cck_workflow/cck_workflow.php @@ -21,7 +21,7 @@ class plgCCK_Field_RestrictionCck_Workflow extends JCckPluginRestriction public static function onCCK_Field_RestrictionPrepareContent( &$field, &$config ) { if ( self::$type != $field->restriction ) { - return; + return true; } $restriction = parent::g_getRestriction( $field->restriction_options ); @@ -33,7 +33,7 @@ public static function onCCK_Field_RestrictionPrepareContent( &$field, &$config public static function onCCK_Field_RestrictionPrepareForm( &$field, &$config ) { if ( self::$type != $field->restriction ) { - return; + return true; } $restriction = parent::g_getRestriction( $field->restriction_options ); @@ -45,7 +45,7 @@ public static function onCCK_Field_RestrictionPrepareForm( &$field, &$config ) public static function onCCK_Field_RestrictionPrepareStore( &$field, &$config ) { if ( self::$type != $field->restriction ) { - return; + return true; } $restriction = parent::g_getRestriction( $field->restriction_options ); diff --git a/plugins/cck_field_restriction/url_variable/url_variable.php b/plugins/cck_field_restriction/url_variable/url_variable.php index 689f828aa..768c3646e 100644 --- a/plugins/cck_field_restriction/url_variable/url_variable.php +++ b/plugins/cck_field_restriction/url_variable/url_variable.php @@ -21,7 +21,7 @@ class plgCCK_Field_RestrictionUrl_Variable extends JCckPluginRestriction public static function onCCK_Field_RestrictionPrepareContent( &$field, &$config ) { if ( self::$type != $field->restriction ) { - return; + return true; } $restriction = parent::g_getRestriction( $field->restriction_options ); @@ -33,7 +33,7 @@ public static function onCCK_Field_RestrictionPrepareContent( &$field, &$config public static function onCCK_Field_RestrictionPrepareForm( &$field, &$config ) { if ( self::$type != $field->restriction ) { - return; + return true; } $restriction = parent::g_getRestriction( $field->restriction_options ); @@ -45,7 +45,7 @@ public static function onCCK_Field_RestrictionPrepareForm( &$field, &$config ) public static function onCCK_Field_RestrictionPrepareStore( &$field, &$config ) { if ( self::$type != $field->restriction ) { - return; + return true; } $restriction = parent::g_getRestriction( $field->restriction_options ); diff --git a/plugins/cck_field_typo/date/date.php b/plugins/cck_field_typo/date/date.php index 2a048c7c6..64a9c6484 100644 --- a/plugins/cck_field_typo/date/date.php +++ b/plugins/cck_field_typo/date/date.php @@ -70,7 +70,7 @@ protected static function _typo( $typo, $field, $value, &$config = array() ) protected static function _getTimeAgo( $value, $unit, $limit, $alt_format ) { if ( @!mktime( $value ) ) { - return; + return true; } // Init diff --git a/plugins/cck_storage/custom/custom.php b/plugins/cck_storage/custom/custom.php index 51d3a53ad..fc9d646e4 100644 --- a/plugins/cck_storage/custom/custom.php +++ b/plugins/cck_storage/custom/custom.php @@ -330,7 +330,7 @@ public static function onCCK_StoragePrepareSearch( &$field, $match, $value, $nam JFactory::getApplication()->enqueueMessage( JText::_( 'COM_CCK_RADIUS_MATCH_ONLY_WITH_STANDARD' ), 'notice' ); break; case 'none': - return; + return true; break; default: $sql = $target.' REGEXP "'.$TA.'.*'.JCckDatabase::escape( $value ).'.*'.$TZ.'"'; diff --git a/plugins/cck_storage/standard/standard.php b/plugins/cck_storage/standard/standard.php index 16883e132..b5569f482 100644 --- a/plugins/cck_storage/standard/standard.php +++ b/plugins/cck_storage/standard/standard.php @@ -355,7 +355,7 @@ public static function onCCK_StoragePrepareSearch( &$field, $match, $value, $nam } break; case 'none': - return; + return true; break; default: $sql = $target.' LIKE '.JCckDatabase::quote( '%'.JCckDatabase::escape( $value, true ).'%', false ); diff --git a/plugins/cck_storage_location/free/free.php b/plugins/cck_storage_location/free/free.php index 523c0c832..86e4e9371 100644 --- a/plugins/cck_storage_location/free/free.php +++ b/plugins/cck_storage_location/free/free.php @@ -199,7 +199,7 @@ public static function onCCK_Storage_LocationDelete( $pk, &$config = array() ) ( !$canDelete && $canDeleteOwn && $config['author'] != $user->id ) || ( $canDelete && !$canDeleteOwn && $config['author'] == $user->id ) ) { $app->enqueueMessage( JText::_( 'COM_CCK_ERROR_DELETE_NOT_PERMITTED' ), 'error' ); - return; + return true; } // Process @@ -262,7 +262,7 @@ public function onCCK_Storage_LocationSearch( $type, $tables, $fields, $fields_o public function onCCK_Storage_LocationStore( $type, $data, &$config = array(), $pk = 0 ) { if ( self::$type != $type ) { - return; + return true; } if ( $data['_']->table == '#__cck_core' ) { diff --git a/plugins/cck_storage_location/joomla_article/joomla_article.php b/plugins/cck_storage_location/joomla_article/joomla_article.php index 78d19ec15..126054a29 100644 --- a/plugins/cck_storage_location/joomla_article/joomla_article.php +++ b/plugins/cck_storage_location/joomla_article/joomla_article.php @@ -288,7 +288,7 @@ public static function onCCK_Storage_LocationDelete( $pk, &$config = array() ) ( !$canDelete && $canDeleteOwn && $config['author'] != $user->id ) || ( $canDelete && !$canDeleteOwn && $config['author'] == $user->id ) ) { $app->enqueueMessage( JText::_( 'COM_CCK_ERROR_DELETE_NOT_PERMITTED' ), 'error' ); - return; + return true; } // Process @@ -308,11 +308,11 @@ public static function onCCK_Storage_LocationDelete( $pk, &$config = array() ) public function onCCK_Storage_LocationStore( $type, $data, &$config = array(), $pk = 0 ) { if ( self::$type != $type ) { - return; + return true; } if ( isset( $config['primary'] ) && $config['primary'] != self::$type ) { - return; + return true; } if ( ! @$config['storages'][self::$table]['_']->pk ) { self::_core( $config['storages'][self::$table], $config, $pk ); diff --git a/plugins/cck_storage_location/joomla_category/joomla_category.php b/plugins/cck_storage_location/joomla_category/joomla_category.php index 08d1fa98f..34b61b350 100644 --- a/plugins/cck_storage_location/joomla_category/joomla_category.php +++ b/plugins/cck_storage_location/joomla_category/joomla_category.php @@ -252,7 +252,7 @@ public static function onCCK_Storage_LocationDelete( $pk, &$config = array() ) ( !$canDelete && $canDeleteOwn && $config['author'] != $user->id ) || ( $canDelete && !$canDeleteOwn && $config['author'] == $user->id ) ) { $app->enqueueMessage( JText::_( 'COM_CCK_ERROR_DELETE_NOT_PERMITTED' ), 'error' ); - return; + return true; } if ( $table->extension == '' ) { $table->extension = 'com_content'; @@ -276,7 +276,7 @@ public static function onCCK_Storage_LocationDelete( $pk, &$config = array() ) public function onCCK_Storage_LocationStore( $type, $data, &$config = array(), $pk = 0 ) { if ( self::$type != $type ) { - return; + return true; } if ( ! @$config['storages'][self::$table]['_']->pk ) { diff --git a/plugins/cck_storage_location/joomla_user/joomla_user.php b/plugins/cck_storage_location/joomla_user/joomla_user.php index d0c09f134..74ed99d7c 100644 --- a/plugins/cck_storage_location/joomla_user/joomla_user.php +++ b/plugins/cck_storage_location/joomla_user/joomla_user.php @@ -279,7 +279,7 @@ public static function onCCK_Storage_LocationDelete( $pk, &$config = array() ) ( !$canDelete && $canDeleteOwn && $config['author'] != $user->id ) || ( $canDelete && !$canDeleteOwn && $config['author'] == $user->id ) ) { $app->enqueueMessage( JText::_( 'COM_CCK_ERROR_DELETE_NOT_PERMITTED' ), 'error' ); - return; + return true; } // Process @@ -301,7 +301,7 @@ public static function onCCK_Storage_LocationDelete( $pk, &$config = array() ) public function onCCK_Storage_LocationStore( $type, $data, &$config = array(), $pk = 0 ) { if ( self::$type != $type ) { - return; + return true; } if ( ! @$config['storages'][self::$table]['_']->pk ) { 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..2a1505483 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 @@ -256,7 +256,7 @@ public static function onCCK_Storage_LocationDelete( $pk, &$config = array() ) ( !$canDelete && $canDeleteOwn && $config['author'] != $user->id ) || ( $canDelete && !$canDeleteOwn && $config['author'] == $user->id ) ) { $app->enqueueMessage( JText::_( 'COM_CCK_ERROR_DELETE_NOT_PERMITTED' ), 'error' ); - return; + return true; } // Process @@ -278,7 +278,7 @@ public static function onCCK_Storage_LocationDelete( $pk, &$config = array() ) public function onCCK_Storage_LocationStore( $type, $data, &$config = array(), $pk = 0 ) { if ( self::$type != $type ) { - return; + return true; } if ( ! @$config['storages'][self::$table]['_']->pk ) {