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/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/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/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/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_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_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_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' ) {