Changeset 9569

Timestamp:

06/13/08 05:03:55 (5 years ago)

Author:

Stephen.Ostrow

Message:

Fixed the cross application link code to use the no_script_name setting from the settings file of the proper app

Files:

• plugins/sfDoctrineSimpleCMSPlugin/branches/symfony-1.0/lib/helper/CrossApplicationHelper.php (modified) (2 diffs)

plugins/sfDoctrineSimpleCMSPlugin/branches/symfony-1.0/lib/helper/CrossApplicationHelper.php

@@ -39 +39 @@
-    }
-  }
+  /**
+   * Take care of no_script_name
+   */
+  $appSettingsFile = SF_ROOT_DIR.DIRECTORY_SEPARATOR.'apps'.DIRECTORY_SEPARATOR.$app.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'settings.yml' ;
+  if (file_exists($appSettingsFile))
+  {
+    $yml = sfYaml::load($appSettingsFile) ;
+    $no_script_name = isset($yml[$env]['.settings']['no_script_name']) ? $yml[$env]['.settings']['no_script_name'] : false;
+  }
+  
-  if ($env == 'dev')
-  {
@@ -45 +55 @@
-  else 
-  {
-
+( ! $no_script_name ? ('/'. $app . '.php') : '') . 
-  }
-  return $path ;