Changeset 776:4ce635c0ca26 for inc/public

Timestamp:

12/02/11 08:50:18 (14 years ago)

Author:

Dsls <dsls@…>

Branch:

default

Message:

Last updates to getURLFor : removed blog url from function

Location:

inc/public

Files:

• class.dc.template.php (modified) (6 diffs)
• lib.urlhandlers.php (modified) (1 diff)

inc/public/class.dc.template.php

@@ -742 +742 @@
      {
           $f = $this->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$core->url->getURLFor("archive")').'; ?>';
+          return '<?php echo '.sprintf($f,'$core->blog->url.$core->url->getURLFor("archive")').'; ?>';
      }
      
@@ -796 +796 @@
           
           $f = $this->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$core->url->getURLFor("feed","'.$type.'")').'; ?>';
+          return '<?php echo '.sprintf($f,'$core->blog->url.$core->url->getURLFor("feed","'.$type.'")').'; ?>';
      }
      
@@ -881 +881 @@
      {
           $f = $this->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$core->url->getURLFor(\'rsd\')').'; ?>';
+          return '<?php echo '.sprintf($f,'$core->blog->url.$core->url->getURLFor(\'rsd\')').'; ?>';
      }
      
@@ -1045 +1045 @@
           
           $f = $this->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$core->url->getURLFor("feed","category/".'.
+          return '<?php echo '.sprintf($f,'$core->blog->url.$core->url->getURLFor("feed","category/".'.
           '$_ctx->categories->cat_url."/'.$type.'")').'; ?>';
      }
@@ -1055 +1055 @@
      {
           $f = $this->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$core->url->getURLFor("category",$_ctx->categories->cat_url)').'; ?>';
+          return '<?php echo '.sprintf($f,'$core->blog->url.$core->url->getURLFor("category",'.
+               '$_ctx->categories->cat_url)').'; ?>';
      }
      
@@ -1934 +1935 @@
      {
           $f = $this->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$core->url->getURLFor("lang",$_ctx->langs->post_lang)').'; ?>';
+          return '<?php echo '.sprintf($f,'$core->blog->url.$core->url->getURLFor("lang",'.
+               '$_ctx->langs->post_lang)').'; ?>';
      }
      

inc/public/lib.urlhandlers.php

@@ -20 +20 @@
           $url = $core->callBehavior("publicGetURLFor",$type,$value);
           if (!$url) {
-               $url = $core->blog->url.$this->getBase($type);
-               if ($value !== '') {
-                    $url .= '/'.$value;
+               $url = $this->getBase($type);
+               if ($url) {
+                    $url .= '/';
+               }
+               if ($value) {
+                    $url .= $value;
                }
           }