aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/config.inc.php2
-rw-r--r--include/functions.inc.php2
-rw-r--r--template/default/admin/waiting.tpl4
-rw-r--r--upload.php16
4 files changed, 11 insertions, 13 deletions
diff --git a/include/config.inc.php b/include/config.inc.php
index 08312eccc..1fee9c6ea 100644
--- a/include/config.inc.php
+++ b/include/config.inc.php
@@ -170,7 +170,7 @@ $conf['newcat_default_commentable'] = 'true';
// newcat_default_uploadable : at creation, must a category be uploadable or
// not ?
-$conf['newcat_default_uploadable'] = 'true';
+$conf['newcat_default_uploadable'] = 'false';
// newcat_default_visible : at creation, must a category be visible or not ?
// Warning : if the parent category is invisible, the category is
diff --git a/include/functions.inc.php b/include/functions.inc.php
index bb3979ae9..999b4f8b8 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -400,7 +400,7 @@ function format_date($date, $type = 'us', $show_time = false)
}
case 'unix' :
{
- list($year,$month,$day,$hour,$minute,$second) =
+ list($year,$month,$day,$hour,$minute) =
explode('.', date('Y.n.j.G.i', $date));
break;
}
diff --git a/template/default/admin/waiting.tpl b/template/default/admin/waiting.tpl
index ccdbfd5e7..11cd39b2a 100644
--- a/template/default/admin/waiting.tpl
+++ b/template/default/admin/waiting.tpl
@@ -33,9 +33,9 @@
</tr>
<!-- END picture -->
<tr>
- <td colspan="5" align="center">
+ <td colspan="6" align="center">
<input type="submit" name="submit" value="{L_SUBMIT}" class="bouton" />
</td>
</tr>
</table>
-</form> \ No newline at end of file
+</form>
diff --git a/upload.php b/upload.php
index 286f9e051..df947598e 100644
--- a/upload.php
+++ b/upload.php
@@ -122,15 +122,13 @@ if ( isset( $page['cat'] ) and is_numeric( $page['cat'] ) )
$page['cat_site_id'] = $result['site_id'];
$page['cat_name'] = $result['name'];
$page['cat_uploadable'] = $result['uploadable'];
-if ( $page['cat_site_id'] != 1
- or !$conf['upload_available']
- or !$page['cat_uploadable'] )
-{
- echo '<div style="text-align:center;">'.$lang['upload_forbidden'].'<br />';
- echo '<a href="'.add_session_id( './category.php' ).'">';
- echo $lang['thumbnails'].'</a></div>';
- exit();
-}
+ if ($page['cat_site_id'] != 1 or !$page['cat_uploadable'])
+ {
+ echo '<div style="text-align:center;">'.$lang['upload_forbidden'].'<br />';
+ echo '<a href="'.add_session_id( './category.php' ).'">';
+ echo $lang['thumbnails'].'</a></div>';
+ exit();
+ }
}
$error = array();