SlatePermutate Changeset - 1cf1f641a5e5 · protofusion repositories

Changeset - 1cf1f641a5e5

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Nathan Brink (binki) - 14 years ago 2012-03-28 11:10:15
ohnobinki@ohnopublishing.net

Make school_crawl_url() actually function properly for relative URIs.

1 file changed with 7 insertions and 4 deletions:

inc/school.crawl.inc

0 comments (0 inline, 0 general)

inc/school.crawl.inc

➞

Show inline comments

@@ @@ -577,30 +577,33 @@ function school_crawl_form_select_array( @@
  * \param $url
  *   The new URL to be reconciled with the original one.
  * \return
  *   A string, the new URL.
  */
 function school_crawl_url($orig_url, $url)
+{
   /*
    * This accounts for both if the $url is already an absolute, fully
    * qualified URL. It falls back to the original URL if it fails to
    * match.
    */
-  foreach (array($url, $orig_url) as $aurl)
+  foreach (array($orig_url, $url) as $aurl)
     if (preg_match(';^(https?)://([^/]+)(/.*)$;', $aurl, $matches))
+      {
 	$new_url['schema'] = $matches[1];
 	$new_url['hostname'] = $matches[2];
 	$new_url['path'] = $matches[3];
 	if (!empty($matches[1]))
 	  $new_url['schema'] = $matches[1];
 	if (!empty($matches[2]))
 	  $new_url['hostname'] = $matches[2];
 	if (!empty($matches[3]))
 	  $new_url['path'] = $matches[3];
+      }
   /* check if we have an absolute relative path */
   if (!strncmp($url, '/', 1))
     $new_url['path'] = $url;
   /* relative */
   while (!strncmp($url, '../', 3))
+    {
       $new_url['path'] = preg_replace(';[^/]+/[^/]+$;', '/', dirname($new_url['path']));
       $url = substr($url, 3);
+    }

0 comments (0 inline, 0 general)