Indefero Commit Details

Date:

2008-11-30 04:18:58 (16 years 4 months ago)

Author:

Loic d'Anterroches

Branch:

dev, develop, feature-issue_links, feature.better-home, feature.content-md5, feature.diff-whitespace, feature.download-md5, feature.issue-links, feature.issue-of-others, feature.issue-summary, feature.search-filter, feature.webrepos, feature.wiki-default-page, master, release-1.1, release-1.2, release-1.3

Commit:

2732da9dbb8f767cd423be1ef396f2ba20012d1c

Parents:

57a4ea7cb034522a708a338e2d701b5014bf2716

Message:

Fixed possible fatal error in the Wiki.

The error could be triggered only when playing with the URL manually.

Changes:

File differences

-48
49 49
50 50
51 
51
52 52
53 53
54 54
+            try {␊
                $request->project = IDF_Project::getOr404($match[1]);␊
            } catch (Pluf_HTTP_Error404 $e) {␊
                return new Pluf_HTTP_Response_NotFound(sprintf(__('The page <em>%s</em> was not found on the server.'), htmlspecialchars($request->query)));␊
                return new Pluf_HTTP_Response_NotFound($request);␊
            }␊
            $request->conf = new IDF_Conf();␊
            $request->conf->setProject($request->project);␊
             try {␊
                 $request->project = IDF_Project::getOr404($match[1]);␊
             } catch (Pluf_HTTP_Error404 $e) {␊
-                return new Pluf_HTTP_Response_NotFound(sprintf(__('The page <em>%s</em> was not found on the server.'), htmlspecialchars($request->query)));␊
+                return new Pluf_HTTP_Response_NotFound($request);␊
             }␊
             $request->conf = new IDF_Conf();␊
             $request->conf->setProject($request->project);␊

-216
217 217
218 218
219 
219
220 220
221 221
222 222
... ...
225 225
226 226
227 227
228 
228
229 229
230 230
231 231
+                            array($prj->id, $match[2]));␊
        $pages = Pluf::factory('IDF_WikiPage')->getList(array('filter'=>$sql->gen()));␊
        if ($pages->count() != 1) {␊
            throw new Pluf_HTTP_Error404($request);␊
            throw new Pluf_HTTP_Response_NotFound($request);␊
        }␊
        $page = $pages[0];␊
        $oldrev = false;␊

            $oldrev = Pluf_Shortcuts_GetObjectOr404('IDF_WikiRevision',␊
                                                    $request->GET['rev']);␊
            if ($oldrev->wikipage != $page->id or $oldrev->is_head == true) {␊
                throw new Pluf_HTTP_Error404($request);␊
                throw new Pluf_HTTP_Response_NotFound($request);␊
            }␊
        }␊
        $ptags = self::getWikiTags($prj);␊
 ...
                             array($prj->id, $match[2]));␊
         $pages = Pluf::factory('IDF_WikiPage')->getList(array('filter'=>$sql->gen()));␊
         if ($pages->count() != 1) {␊
-            throw new Pluf_HTTP_Error404($request);␊
+            throw new Pluf_HTTP_Response_NotFound($request);␊
         }␊
         $page = $pages[0];␊
         $oldrev = false;␊
             $oldrev = Pluf_Shortcuts_GetObjectOr404('IDF_WikiRevision',␊
                                                     $request->GET['rev']);␊
             if ($oldrev->wikipage != $page->id or $oldrev->is_head == true) {␊
-                throw new Pluf_HTTP_Error404($request);␊
+                throw new Pluf_HTTP_Response_NotFound($request);␊
             }␊
         }␊
         $ptags = self::getWikiTags($prj);␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags