better url_simplify() (#2787)

ms609 · Apr 1, 2020 · 98707e0 · 98707e0
1 parent ce6f5f0
commit 98707e0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/tests/phpunit/zoteroTest.php b/tests/phpunit/zoteroTest.php
@@ -97,7 +97,7 @@ public function testDropSomeURLEquivs5() {
   public function testSimpleIEEE() {
     $url = "http://ieeexplore.ieee.org/arnumber=123456789";
     $url = url_simplify($url);
-    $this->assertSame('http://ieeexplore.ieee.org/123456789/', $url);
+    $this->assertSame('http:/ieeexplore.ieee.org/123456789/', $url);
   }
 
   public function testIEEEdoi() {

diff --git a/zotero.php b/zotero.php
@@ -631,8 +631,8 @@ function url_simplify($url) {
     $url = 'https://ieeexplore.ieee.org/document/' . $matches[1];
   }
   $url = $url . '/';
-  $url = str_replace(['/abstract/', '/full/', '/full+pdf/', '/pdf/', '/document/', '/html/', '/html+pdf/', '/abs/', '/epdf/', '/doi/', '/xprint/', '/print/', '.short/', '.long/'],
-                     ['/', '/', '/', '/', '/', '/', '/', '/', '/', '/', '/', '/', '/', '/'], $url);
+  $url = str_replace(['/abstract/', '/full/', '/full+pdf/', '/pdf/', '/document/', '/html/', '/html+pdf/', '/abs/', '/epdf/', '/doi/', '/xprint/', '/print/', '.short', '.long', '.abstract', '.full', '///', '//'],
+                     ['/', '/', '/', '/', '/', '/', '/', '/', '/', '/', '/', '/', '/', '/', '/', '/', '/', '/'], $url);
   $ul = substr($url, 0, -1); // Remove the ending slash we added
   $url = strtok($url, '?#');
   $url = str_ireplace('https', 'http', $url);