Permalink
Browse files

Bug fixes

git-svn-id: http://joomlacode.org/svn/joomla/development/trunk@4960 6f6e1ebd-4c2b-0410-823f-f34bde69bce9
  • Loading branch information...
1 parent 94820a0 commit fc0d6c86aade05d4e1a71c3092ea248709fe7c44 @eddieajau eddieajau committed Sep 7, 2006
View
11 administrator/includes/framework.php
@@ -30,9 +30,16 @@
*/
// System includes
-require_once( JPATH_CONFIGURATION . DS . 'configuration.php' );
require_once( JPATH_LIBRARIES . DS . 'loader.php' );
+// Clean the request before anything else is loaded
+jimport( 'joomla.common.abstract.object' );
+jimport( 'joomla.environment.request' );
+JRequest::clean();
+
+// System includes
+require_once( JPATH_CONFIGURATION . DS . 'configuration.php' );
+
// System configuration
$CONFIG = new JConfig();
@@ -52,7 +59,6 @@
// Include object abstract class
jimport( 'joomla.common.compat.compat' );
-jimport( 'joomla.common.abstract.object' );
// System profiler
if (JDEBUG) {
@@ -68,7 +74,6 @@
jimport( 'joomla.application.user.authenticate' );
jimport( 'joomla.application.user.user' );
jimport( 'joomla.database.table' );
-jimport( 'joomla.environment.request' );
jimport( 'joomla.environment.session' );
jimport( 'joomla.environment.uri' );
jimport( 'joomla.factory' );
View
3 administrator/index.php
@@ -19,9 +19,6 @@
require_once( JPATH_BASE.'/includes/defines.php' );
require_once( JPATH_BASE.'/includes/application.php' );
-// Clean the request
-JRequest::clean();
-
/**
* CREATE THE APPLICATION
*/
View
6 components/com_content/views/article/view.html.php
@@ -258,6 +258,12 @@ function edit()
$document =& JFactory::getDocument();
$user =& JFactory::getUser();
+ // Make sure you are logged in
+ if ($user->get('gid') < 1) {
+ JError::raiseError( 403, JText::_('ALERTNOTAUTH') );
+ return;
+ }
+
$pathway =& $mainframe->getPathWay();
// At some point in the future this will come from a request object
View
10 includes/framework.php
@@ -30,9 +30,15 @@
*/
// System includes
-require_once( JPATH_CONFIGURATION . DS . 'configuration.php' );
require_once( JPATH_LIBRARIES . DS . 'loader.php' );
+// Clean the request before anything else is loaded
+jimport( 'joomla.common.abstract.object' );
+jimport( 'joomla.environment.request' );
+JRequest::clean();
+
+require_once( JPATH_CONFIGURATION . DS . 'configuration.php' );
+
// System configuration
$CONFIG = new JConfig();
@@ -52,7 +58,6 @@
// Include object abstract class
jimport( 'joomla.common.compat.compat' );
-jimport( 'joomla.common.abstract.object' );
// System profiler
if (JDEBUG) {
@@ -67,7 +72,6 @@
jimport( 'joomla.application.menu' );
jimport( 'joomla.application.user.user' );
jimport( 'joomla.database.table' );
-jimport( 'joomla.environment.request' );
jimport( 'joomla.environment.session' );
jimport( 'joomla.environment.uri' );
jimport( 'joomla.factory' );
View
3 index.php
@@ -19,9 +19,6 @@
require_once ( JPATH_BASE .'/includes/defines.php' );
require_once ( JPATH_BASE .'/includes/application.php' );
-// Clean the request
-JRequest::clean();
-
/**
* CREATE THE APPLICATION
*/
View
7 installation/includes/framework.php
@@ -34,6 +34,11 @@
// System includes
require_once( JPATH_LIBRARIES . DS . 'loader.php' );
+// Clean the request before anything else is loaded
+jimport( 'joomla.common.abstract.object' );
+jimport( 'joomla.environment.request' );
+JRequest::clean();
+
// Installation file includes
define( 'JPATH_INCLUDES', dirname(__FILE__) );
@@ -47,13 +52,11 @@
// Include object abstract class
jimport( 'joomla.common.compat.compat' );
-jimport( 'joomla.common.abstract.object' );
// Joomla! library imports
jimport( 'joomla.application.application' );
jimport( 'joomla.application.user.user' );
jimport( 'joomla.database.table' );
-jimport( 'joomla.environment.request' );
jimport( 'joomla.environment.session' );
jimport( 'joomla.environment.uri' );
jimport( 'joomla.factory' );
View
3 installation/index.php
@@ -17,9 +17,6 @@
require_once( JPATH_BASE .'/includes/defines.php' );
require_once( JPATH_BASE .'/includes/application.php' );
-// Clean the request
-JRequest::clean();
-
// create the mainframe object
$mainframe = new JInstallation();
View
10 xmlrpc/includes/framework.php
@@ -35,6 +35,14 @@
// System includes
require_once( JPATH_LIBRARIES . DS . 'loader.php' );
+// Clean the request before anything else is loaded
+jimport( 'joomla.common.abstract.object' );
+jimport( 'joomla.environment.request' );
+// TODO: Check why there is a problem here
+//JRequest::clean();
+
+require_once( JPATH_LIBRARIES . DS . 'loader.php' );
+
// File includes
define( 'JPATH_INCLUDES', dirname(__FILE__) );
@@ -44,15 +52,13 @@
// Include object abstract class
jimport( 'joomla.common.compat.compat' );
-jimport( 'joomla.common.abstract.object' );
// Joomla! library imports
jimport( 'joomla.application.application' );
jimport( 'joomla.application.event' );
jimport( 'joomla.application.extension.plugin' );
jimport( 'joomla.application.user.user' );
jimport( 'joomla.database.table' );
-jimport( 'joomla.environment.request' );
jimport( 'joomla.environment.session' );
jimport( 'joomla.environment.uri' );
jimport( 'joomla.factory' );

0 comments on commit fc0d6c8

Please sign in to comment.