[Solar-svn] Revision 2742

[pmjones at solarphp.com]

branch: [FIX] changed usage from Solar_Uri[_Action|_Public]->fetch() to ->get()


Modified: branches/orm/Solar/Controller/Page.php
===================================================================
--- branches/orm/Solar/Controller/Page.php	2007-09-07 14:23:15 UTC (rev 2741)
+++ branches/orm/Solar/Controller/Page.php	2007-09-07 15:11:01 UTC (rev 2742)
@@ -900,7 +900,7 @@
     protected function _redirect($spec, $code = 302)
     {
         if ($spec instanceof Solar_Uri_Action) {
-            $href = $spec->fetch(true);
+            $href = $spec->get(true);
         } elseif (strpos($spec, '://') !== false) {
             // external link, protect against header injections
             $href = str_replace(array("\r", "\n"), '', $spec);

Modified: branches/orm/Solar/Http/Request/Adapter.php
===================================================================
--- branches/orm/Solar/Http/Request/Adapter.php	2007-09-07 14:23:15 UTC (rev 2741)
+++ branches/orm/Solar/Http/Request/Adapter.php	2007-09-07 15:11:01 UTC (rev 2742)
@@ -584,7 +584,7 @@
     public function setProxy($spec)
     {
         if ($spec instanceof Solar_Uri) {
-            $this->_proxy = $spec->fetch(true);
+            $this->_proxy = $spec->get(true);
         } else {
             $this->_proxy = $spec;
         }

Modified: branches/orm/Solar/View/Helper/Action.php
===================================================================
--- branches/orm/Solar/View/Helper/Action.php	2007-09-07 14:23:15 UTC (rev 2741)
+++ branches/orm/Solar/View/Helper/Action.php	2007-09-07 15:11:01 UTC (rev 2742)
@@ -71,7 +71,7 @@
     {
         if ($spec instanceof Solar_Uri_Action) {
             // already an action uri object
-            $href = $spec->fetch();
+            $href = $spec->get();
         } else {
             // build-and-fetch the string as an action spec
             $href = $this->_uri->quick($spec);

Modified: branches/orm/Solar/View/Helper/ActionImage.php
===================================================================
--- branches/orm/Solar/View/Helper/ActionImage.php	2007-09-07 14:23:15 UTC (rev 2741)
+++ branches/orm/Solar/View/Helper/ActionImage.php	2007-09-07 15:11:01 UTC (rev 2742)
@@ -70,7 +70,7 @@
     {
         if ($spec instanceof Solar_Uri_Action) {
             // already an action uri object
-            $href = $spec->fetch();
+            $href = $spec->get();
         } else {
             // build-and-fetch the string as an action spec
             $href = $this->_uri->quick($spec);

Modified: branches/orm/Solar/View/Helper/Anchor.php
===================================================================
--- branches/orm/Solar/View/Helper/Anchor.php	2007-09-07 14:23:15 UTC (rev 2741)
+++ branches/orm/Solar/View/Helper/Anchor.php	2007-09-07 15:11:01 UTC (rev 2742)
@@ -46,7 +46,7 @@
     {
         if ($spec instanceof Solar_Uri) {
             // fetch the full href, not just the path/query/fragment
-            $href = $spec->fetch(true);
+            $href = $spec->get(true);
         } else {
             $href = $spec;
         }

Modified: branches/orm/Solar/View/Helper/AnchorImage.php
===================================================================
--- branches/orm/Solar/View/Helper/AnchorImage.php	2007-09-07 14:23:15 UTC (rev 2741)
+++ branches/orm/Solar/View/Helper/AnchorImage.php	2007-09-07 15:11:01 UTC (rev 2742)
@@ -48,7 +48,7 @@
     {
         if ($spec instanceof Solar_Uri) {
             // fetch the full href, not just the path/query/fragment
-            $href = $spec->fetch(true);
+            $href = $spec->get(true);
         } else {
             $href = $spec;
         }

Modified: branches/orm/Solar/View/Helper/PublicHref.php
===================================================================
--- branches/orm/Solar/View/Helper/PublicHref.php	2007-09-07 14:23:15 UTC (rev 2741)
+++ branches/orm/Solar/View/Helper/PublicHref.php	2007-09-07 15:11:01 UTC (rev 2742)
@@ -66,7 +66,7 @@
     {
         if ($spec instanceof Solar_Uri_Public) {
             // already a public uri object
-            $href = $spec->fetch();
+            $href = $spec->get();
         } elseif (strpos($spec, '://')) {
             // use the href as-is
             $href = $spec;