Version 4.7.13
This commit is contained in:
1 parent
fd22d99e69
commit
7124a02564
954 files changed
+29277
-59308
No files matched your search
@@ -1817,7 +1817,7 @@ class _databases extends \IPS\Node\Controller
|
||||
|
||||
$form->add( new \IPS\Helpers\Form\YesNo( 'database_tags_enabled' , $current ? $current->tags_enabled : FALSE, FALSE, array( 'togglesOn' => array( 'database_tags_noprefixes', 'database_tags_predefined' ) ), NULL, NULL, NULL, 'database_tags_enabled' ) );
|
||||
$form->add( new \IPS\Helpers\Form\YesNo( 'database_tags_noprefixes', $current ? ! $current->tags_noprefixes : FALSE, FALSE, array(), NULL, NULL, NULL, 'database_tags_noprefixes' ) );
|
||||
$form->add( new \IPS\Helpers\Form\Text( 'database_tags_predefined', $current ? $current->tags_predefined: '', FALSE, array( 'autocomplete' => array( 'unique' => 'true' ), 'nullLang' => 'database_tags_predefined_unlimited' ), NULL, NULL, NULL, 'database_tags_predefined' ) );
|
||||
$form->add( new \IPS\Helpers\Form\Text( 'database_tags_predefined', $current ? $current->tags_predefined: '', FALSE, array( 'autocomplete' => array( 'unique' => 'true', 'alphabetical' => \IPS\Settings::i()->tags_alphabetical ), 'nullLang' => 'database_tags_predefined_unlimited' ), NULL, NULL, NULL, 'database_tags_predefined' ) );
|
||||
}
|
||||
|
||||
$form->addHeader( 'content_database_form_options_fields' );
|
||||
|
||||
@@ -357,26 +357,19 @@ class _media extends \IPS\Node\Controller
|
||||
{
|
||||
$filename = mb_substr( $filename, mb_strlen( $prefix ) );
|
||||
}
|
||||
|
||||
|
||||
$new = new \IPS\cms\Media;
|
||||
$new->filename = $filename;
|
||||
$new->filename_stored = $parent . '_' . $filename;
|
||||
$new->is_image = $media->isImage();
|
||||
$new->parent = $parent;
|
||||
$new->added = time();
|
||||
$new->file_object = (string) \IPS\File::create( 'cms_Media', $new->filename_stored, $media->contents(), 'pages_media', TRUE, NULL, FALSE );
|
||||
$new->file_object = (string) $media;
|
||||
$new->save();
|
||||
|
||||
$new->setFullPath( ( $parent ? \IPS\cms\Media\Folder::load( $parent )->path : '' ) );
|
||||
$new->save();
|
||||
|
||||
/* Remove the original as we created a copy with a slightly altered filename */
|
||||
try
|
||||
{
|
||||
$media->delete();
|
||||
}
|
||||
catch( \Exception $ex ) { }
|
||||
|
||||
$count++;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user