Pluf Framework Commit Details

Date:

2009-01-13 02:36:57 (15 years 11 months ago)

Author:

Loic d'Anterroches

Branch:

develop, master

Commit:

3277c33de0b8a69569a593eb8cef0cfb9a39bbb5

Parents:

3aa1b808765dc9cc526fc9da95b6a7698a1d7fdd

Message:

Fixed to use the PATH_INFO and not ORIG_PATH_INFO.

Changes:

File differences

-63
64 64
65 65
66 
67 
66
68 67
69 68
70 69
71 70
72 71
73 
74 
75 
76 
77 
78 
79 
72
73
80 74
81 75
82 76
+    /**␊
     * Get the action of the request.␊
     *␊
     * Depending of the format, the action is either the path_info,␊
     * the query string or the _px_action parameter.␊
     * We directly get the PATH_INFO variable or return '/'␊
     *␊
     * @return string Action␊
     */␊
    public static function getAction()␊
    {␊
        if (isset($_SERVER['ORIG_PATH_INFO'])) {␊
            return $_SERVER['ORIG_PATH_INFO'];␊
        }␊
        if (isset($_SERVER['PATH_INFO'])) {␊
            return $_SERVER['PATH_INFO'];␊
        }␊
        return '/';␊
        return (isset($_SERVER['PATH_INFO'])) ?␊
            $_SERVER['PATH_INFO'] : '/';␊
    }␊
}␊
␊
     /**␊
      * Get the action of the request.␊
      *␊
-     * Depending of the format, the action is either the path_info,␊
-     * the query string or the _px_action parameter.␊
+     * We directly get the PATH_INFO variable or return '/'␊
      *␊
      * @return string Action␊
      */␊
     public static function getAction()␊
     {␊
-        if (isset($_SERVER['ORIG_PATH_INFO'])) {␊
-            return $_SERVER['ORIG_PATH_INFO'];␊
-        }␊
-        if (isset($_SERVER['PATH_INFO'])) {␊
-            return $_SERVER['PATH_INFO'];␊
-        }␊
-        return '/';␊
+        return (isset($_SERVER['PATH_INFO'])) ?␊
+            $_SERVER['PATH_INFO'] : '/';␊
     }␊
 }␊
 ␊

Download the corresponding diff file

Pluf Framework

File differences

Branches

Tags