Changeset 2313:ef1db3d7c388 for inc/public

Timestamp:

10/08/13 15:27:39 (12 years ago)

Author:

Dsls

Branch:

twig

Parents:

1524:913f5a36bbb0 (diff), 2312:d01c85eaa37d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Twig merge - lots of things to adapt yet

Location:

inc/public

Files:

• lib.urlhandlers.php (modified) (2 diffs)
• prepend.php (modified) (1 diff)

inc/public/lib.urlhandlers.php

@@ -263 +263 @@
                $params = new ArrayObject(array(
                     'cat_url' => $args,
-                    'post_type' => 'post'));
+                    'post_type' => 'post',
+                    'without_empty' => false));
                
                $core->callBehavior('publicCategoryBeforeGetCategories',$params,$args);
@@ -479 +480 @@
                     
                     # The entry
+                    if ($_ctx->posts->trackbacksActive()) {
+                         header('X-Pingback: '.$core->blog->url.$core->url->getURLFor("xmlrpc",$core->blog->id));
+                    }
                     self::serveDocument('post.html');
                }

inc/public/prepend.php

@@ -69 +69 @@
 $_lang = preg_match('/^[a-z]{2}(-[a-z]{2})?$/',$_lang) ? $_lang : 'en';
 
+l10n::lang($_lang);
 if (l10n::set(dirname(__FILE__).'/../../locales/'.$_lang.'/date') === false && $_lang != 'en') {
      l10n::set(dirname(__FILE__).'/../../locales/en/date');