svn commit: [jahia] r19012 - /trunk/core/src/java/org/jahia/services/pages/ContentPage.java

[tdraier]

Author: tdraier
Date: Wed Oct 31 17:31:27 2007
New Revision: 19012

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19012&repname=
=3Djahia
Log:
try to get the correct template for requested language when possible ( ATOS=
-56 )

Modified:
    trunk/core/src/java/org/jahia/services/pages/ContentPage.java

Modified: trunk/core/src/java/org/jahia/services/pages/ContentPage.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/pages/ContentPage.java&rev=3D19012&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/services/pages/ContentPage.java (original)
+++ trunk/core/src/java/org/jahia/services/pages/ContentPage.java Wed Oct 3=
1 17:31:27 2007
@@ -492,7 +492,10 @@
     }
 =

     public final int getPageTemplateID(EntryLoadRequest loadRequest) {
-        JahiaPageInfo pageInfo =3D getPageInfoVersionIgnoreLanguage(loadRe=
quest, false);
+        JahiaPageInfo pageInfo =3D getPageInfoVersion(loadRequest, false, =
false);
+        if (pageInfo =3D=3D null) {
+            pageInfo =3D getPageInfoVersionIgnoreLanguage(loadRequest, fal=
se);
+        }
         if (pageInfo =3D=3D null) {
             return -1;
         }

_______________________________________________
cvs_list mailing list
cvs_list@jahia.org
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list