Index: .hgsubstate =================================================================== --- .hgsubstate (revision 1624) +++ .hgsubstate (revision 1529) @@ -1,1 +1,1 @@ -f5e0517435fc94082b6acaad5f4f111252b6149f inc/libs/clearbricks +716e99c54652d08c2e4395d5179e817e0f98182d inc/libs/clearbricks Index: admin/blog.php =================================================================== --- admin/blog.php (revision 1615) +++ admin/blog.php (revision 1482) @@ -82,12 +82,7 @@ '
'. form::field('blog_id',30,32,html::escapeHTML($blog_id)).'
'. - ''.__('At least 2 characters using letters, numbers or symbols.').'
'; - - if ($blog_id) { - echo - ''.__('Please note that changing your blog ID may require changes in your public index.php file.').'
'; - } + ''.__('At least 2 characters using letters, numbers or symbols.').'
'. + ''.__('Please note that changing your blog ID may require changes in your public index.php file.').'
'. - echo ''. form::field('blog_name',30,255,html::escapeHTML($blog_name)).'
'. Index: admin/blog_pref.php =================================================================== --- admin/blog_pref.php (revision 1620) +++ admin/blog_pref.php (revision 1553) @@ -111,12 +111,8 @@ # Image default size combo $img_default_size_combo = array(); -try { - $media = new dcMedia($core); - $img_default_size_combo[__('original')] = 'o'; - foreach ($media->thumb_sizes as $code => $size) { - $img_default_size_combo[__($size[2])] = $code; - } -} catch (Exception $e) { - $core->error->add($e->getMessage()); +$media = new dcMedia($core); +$img_default_size_combo[__('original')] = 'o'; +foreach ($media->thumb_sizes as $code => $size) { + $img_default_size_combo[__($size[2])] = $code; } @@ -174,5 +170,5 @@ if ($rs) { - throw new Exception(__('This blog ID is already used.')); + throw new Exception(__('That blog Id is already in use.')); } } Index: admin/index.php =================================================================== --- admin/index.php (revision 1620) +++ admin/index.php (revision 1558) @@ -247,26 +247,4 @@ } -$err = array(); - -# Check cache directory -if (!is_dir(DC_TPL_CACHE)) { - $err[] = ''.sprintf(__('Cache directory %s does not exist.'),DC_TPL_CACHE).'
'; -} else if (!is_writable(DC_TPL_CACHE)) { - $err[] = ''.sprintf(__('Cache directory %s is not writable.'),DC_TPL_CACHE).'
'; -} - -# Check public directory -if (!is_dir($core->blog->public_path)) { - $err[] = ''.sprintf(__('Directory %s does not exist.'),$core->blog->public_path).'
'; -} else if (!is_writable($core->blog->public_path)) { - $err[] = ''.sprintf(__('Directory %s is not writable.'),$core->blog->public_path).'
'; -} - -# Error list -if (count($err) > 0) { - echo 'Erreur :
'. - ''.sprintf(__('Dotclear %s is available!'),$new_v).'
'. - '