diff --git a/wacko/action/hashid.php b/wacko/action/hashid.php --- a/wacko/action/hashid.php +++ b/wacko/action/hashid.php @@ -7,6 +7,8 @@ // {{hashid}} +// Import the Hashids class into the global namespace +use Hashids\Hashids; $hashids = new Hashids($this->db->hashid_seed); if (isset($this->page['version_id'])) diff --git a/wacko/class/urirouter.php b/wacko/class/urirouter.php --- a/wacko/class/urirouter.php +++ b/wacko/class/urirouter.php @@ -6,6 +6,8 @@ { exit; } +// Import the Hashids class into the global namespace +use Hashids\Hashids; class UriRouter { diff --git a/wacko/config/autoload.conf b/wacko/config/autoload.conf --- a/wacko/config/autoload.conf +++ b/wacko/config/autoload.conf @@ -17,11 +17,11 @@ formatter/class/typografica.php Typografica formatter/class/wackoformatter.php WackoFormatter lib/safehtml/safehtml.php SafeHTML -lib/hashids/Hashids.php Hashids -lib/hashids/HashidsInterface.php HashidsInterface -lib/hashids/Math/Bc.php Bc -lib/hashids/Math/Gmp.php Gmp -lib/hashids/Math/MathInterface.php MathInterface +lib/hashids/Hashids.php Hashids\Hashids +lib/hashids/HashidsInterface.php Hashids\HashidsInterface +lib/hashids/Math/Bc.php Hashids\Math\Bc +lib/hashids/Math/Gmp.php Hashids\Math\Gmp +lib/hashids/Math/MathInterface.php Hashids\Math\MathInterface lib/php-diff/Diff.php Diff lib/php-diff/Diff/Renderer/Html/Array.php Diff_Renderer_Html_Array lib/php-diff/Diff/Renderer/Html/Inline.php Diff_Renderer_Html_Inline diff --git a/wacko/lib/hashids/Hashids.php b/wacko/lib/hashids/Hashids.php --- a/wacko/lib/hashids/Hashids.php +++ b/wacko/lib/hashids/Hashids.php @@ -9,11 +9,11 @@ * file that was distributed with this source code. */ -# namespace Hashids; +namespace Hashids; -# use Hashids\Math\Bc; -# use Hashids\Math\Gmp; -# use RuntimeException; +use Hashids\Math\Bc; +use Hashids\Math\Gmp; +use RuntimeException; /** * This is the hashids class. diff --git a/wacko/lib/hashids/HashidsException.php b/wacko/lib/hashids/HashidsException.php --- a/wacko/lib/hashids/HashidsException.php +++ b/wacko/lib/hashids/HashidsException.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -# namespace Hashids; +namespace Hashids; -# use InvalidArgumentException; +use InvalidArgumentException; /** * This is the hashids exception class. diff --git a/wacko/lib/hashids/HashidsInterface.php b/wacko/lib/hashids/HashidsInterface.php --- a/wacko/lib/hashids/HashidsInterface.php +++ b/wacko/lib/hashids/HashidsInterface.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -# namespace Hashids; +namespace Hashids; /** * This is the hashids interface. diff --git a/wacko/lib/hashids/Math/Bc.php b/wacko/lib/hashids/Math/Bc.php --- a/wacko/lib/hashids/Math/Bc.php +++ b/wacko/lib/hashids/Math/Bc.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -# namespace Hashids\Math; +namespace Hashids\Math; /** * This is the Bc math class. diff --git a/wacko/lib/hashids/Math/Gmp.php b/wacko/lib/hashids/Math/Gmp.php --- a/wacko/lib/hashids/Math/Gmp.php +++ b/wacko/lib/hashids/Math/Gmp.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -# namespace Hashids\Math; +namespace Hashids\Math; /** * This is the Gmp math class. diff --git a/wacko/lib/hashids/Math/MathInterface.php b/wacko/lib/hashids/Math/MathInterface.php --- a/wacko/lib/hashids/Math/MathInterface.php +++ b/wacko/lib/hashids/Math/MathInterface.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -# namespace Hashids\Math; +namespace Hashids\Math; /** * Interface for different math extensions.