Changeset 3

Timestamp:

08/11/08 11:18:35 (5 months ago)

Author:

akinder

Message:

Fixed #4

Location:

htdocs/core_layer

Files:

• classes/output/sgen.parse/parse_url.php (modified) (1 diff)
• serenity.php (modified) (1 diff)

htdocs/core_layer/classes/output/sgen.parse/parse_url.php

@@ -1 @@
-$PARSE['string'] = Serenity::get('base_app_url').'/'.$PARSE['args'][0];
+if( $PARSE['args'][0][0] == '/' )
+{
+        $PARSE['args'][0] = @substr( $PARSE['args'][0], 1 );
+}
+
+if( @strripos( Serenity::get('base_app_url'), '/' ) == ( @strlen( Serenity::get('base_app_url') ) -1 ) )
+{
+        $PARSE['string'] = Serenity::get('base_app_url').$PARSE['args'][0];
+}
+else
+{
+        $PARSE['string'] = Serenity::get('base_app_url').'/'.$PARSE['args'][0];
+}
 
 if( ( !Serenity::user()->get('use_cookies') ) && Serenity::user()->is_logged_in() )

htdocs/core_layer/serenity.php

@@ -420 +420 @@
                         
                         $app_url = "http://{$Apps->bind_host}{$this->subs}";
-                        $app_url .= ( $Apps->path_key != '*' ) ? $Apps->path_key.'/' : '';
-                        
+                        $app_url .= ( $Apps->path_key != '*' ) ? $Apps->path_key : '';
+                
                         self::set( 'base_app_url', $app_url );
                         self::set( 'base_action_url', $app_url . $Action->action_key );