svn commit: [jahia] r19084 - /branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/pages/ContentPage.java

[sshyrkov]

Author: sshyrkov
Date: Fri Nov  9 09:42:35 2007
New Revision: 19084

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

Modified:
    branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/page=
s/ContentPage.java

Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/pages/ContentPage.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/pages/ContentPage.java&rev=3D=
19084&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
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/page=
s/ContentPage.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/page=
s/ContentPage.java Fri Nov  9 09:42:35 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