aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvdigital <vdigital@piwigo.org>2007-06-12 21:52:46 +0000
committervdigital <vdigital@piwigo.org>2007-06-12 21:52:46 +0000
commit174417b8cfe43ef60ed8daf9c7657c1932eb35bb (patch)
tree1f8e3b2323145af24a8e5004cb5eef457bddf773
parente8c396c06b6f8352bc2119038b89a4a4b80c67f6 (diff)
Bug 0000705: Upload error with incomplete URL.
+ Broken link in Admin/intro.php git-svn-id: http://piwigo.org/svn/trunk@2033 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--admin/intro.php2
-rw-r--r--upload.php5
2 files changed, 5 insertions, 2 deletions
diff --git a/admin/intro.php b/admin/intro.php
index e23c5e9ab..7c50ce2ce 100644
--- a/admin/intro.php
+++ b/admin/intro.php
@@ -244,7 +244,7 @@ if ($nb_waiting > 0)
$template->assign_block_vars(
'waiting',
array(
- 'URL' => PHPWG_ROOT_PATH.'admin.php?page=waiting',
+ 'URL' => PHPWG_ROOT_PATH.'admin.php?page=upload',
'INFO' => sprintf(l10n('%d waiting for validation'), $nb_waiting)
)
);
diff --git a/upload.php b/upload.php
index e304af70f..3ba555486 100644
--- a/upload.php
+++ b/upload.php
@@ -124,7 +124,7 @@ function validate_upload( $temp_name, $my_max_file_size,
}
//-------------------------------------------------- access authorization check
-if (is_numeric($_GET['cat']))
+if (isset($_GET['cat']) and is_numeric($_GET['cat']))
{
$page['category'] = $_GET['cat'];
}
@@ -140,6 +140,9 @@ if (isset($page['category']))
die('Fatal: you take a wrong way, bye bye');
}
}
+else { // $page['category'] may be set by a futur plugin but without it
+ die('Fatal: you take a wrong way, bye bye');
+}
$error = array();
$page['upload_successful'] = false;