YOURLS · ozh · Sep 18, 2025 · Sep 7, 2025 · Sep 9, 2025 · Sep 9, 2025
diff --git a/.gitignore b/.gitignore
@@ -46,6 +46,8 @@ Thumbs.db
 Desktop.ini
 # Mac crap
 .DS_Store
-# NetBeans files
+# IDE files
 /nbproject/
 .idea
+.vs
+.vscode
diff --git a/admin/plugins.php b/admin/plugins.php
@@ -109,6 +109,10 @@
 				$data[ $field ] = $plugin[ $value ];
 			} else {
 				$data[ $field ] = yourls__('(no info)');
+                # If it's a URL, set to #
+                if( in_array( $field, array('uri', 'author_uri') ) ) {
+                    $data[$field] = '#' . $data[$field];
+                }
-                # If it's a URL, set to #
-                if( in_array( $field, array('uri', 'author_uri') ) ) {
-                    $data[$field] = '#' . $data[$field];
-                }
+				# If it's a URL, set to #
+				if( in_array( $field, array('uri', 'author_uri') ) ) {
+					$data[$field] = '#' . $data[$field];
+				}
-                # If it's a URL, set to #
-                if( in_array( $field, array('uri', 'author_uri') ) ) {
-                    $data[$field] = '#' . $data[$field];
-                }
+				# If it's a URL, set to #
+				if( in_array( $field, array('uri', 'author_uri') ) ) {
+					$data[$field] = '#' . $data[$field];
+				}
 			}
 			unset( $plugin[$value] );
 		}

diff --git a/includes/Database/YDB.php b/includes/Database/YDB.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * Aura SQL wrapper for YOURLS that creates the allmighty YDB object.
+ * Aura SQL wrapper for YOURLS that creates the almighty YDB object.
  *
  * A fine example of a "class that knows too much" (see https://en.wikipedia.org/wiki/God_object)
  *
  * Note to plugin authors: you most likely SHOULD NOT use directly methods and properties of this class. Use instead
- * function wrappers (eg don't use $ydb->option, or $ydb->set_option(), use yourls_*_options() functions instead).
+ * function wrappers (e.g. don't use $ydb->option, or $ydb->set_option(), use yourls_*_options() functions instead).
  *
  * @since 1.7.3
  */
@@ -33,7 +33,7 @@ class YDB extends ExtendedPdo {
     protected $context = '';
 
     /**
-     * Information related to a short URL keyword (eg timestamp, long URL, ...)
+     * Information related to a short URL keyword (e.g. timestamp, long URL, ...)
      *
      * @var array
      *
@@ -53,13 +53,13 @@ class YDB extends ExtendedPdo {
     protected $option = [];
 
     /**
-     * Plugin admin pages informations
+     * Plugin admin pages information
      * @var array
      */
     protected $plugin_pages = [];
 
     /**
-     * Plugin informations
+     * Plugin information
      * @var array
      */
     protected $plugins = [];
@@ -86,7 +86,7 @@ public function __construct($dsn, $user, $pass, $options) {
      * Init everything needed
      *
      * Everything we need to set up is done here in init(), not in the constructor, so even
-     * when the connection fails (eg config error or DB dead), the constructor has worked
+     * when the connection fails (e.g. config error or DB dead), the constructor has worked,
      * and we have a $ydb object properly instantiated (and for instance yourls_die() can
      * correctly die, even if using $ydb methods)
      *
@@ -405,22 +405,13 @@ public function is_installed() {
     }
 
     /**
-     * Return standardized DB version
-     *
-     * The regex removes everything that's not a number at the start of the string, or remove anything that's not a number and what
-     * follows after that.
-     *   'omgmysql-5.5-ubuntu-4.20' => '5.5'
-     *   'mysql5.5-ubuntu-4.20'     => '5.5'
-     *   '5.5-ubuntu-4.20'          => '5.5'
-     *   '5.5-beta2'                => '5.5'
-     *   '5.5'                      => '5.5'
+     * Return MySQL version
      *
      * @since  1.7.3
      * @return string
      */
     public function mysql_version() {
-        $version = $this->pdo->getAttribute(PDO::ATTR_SERVER_VERSION);
-        return $version;
+        return $this->pdo->getAttribute(PDO::ATTR_SERVER_VERSION);
     }
 
 }
diff --git a/includes/functions-formatting.php b/includes/functions-formatting.php
@@ -234,7 +234,12 @@ function yourls_trim_long_string($string, $length = 60, $append = '[...]') {
  *
  * The regexp searches for the first digits, then a period, then more digits and periods, and discards
  * all the rest.
- * For instance, 'mysql-5.5-beta' and '5.5-RC1' return '5.5'
+ * Examples:
+ * 'omgmysql-5.5-ubuntu-4.20' => '5.5'
+ * 'mysql5.5-ubuntu-4.20'     => '5.5'
+ * '5.5-ubuntu-4.20'          => '5.5'
+ * '5.5-beta2'                => '5.5'
+ * '5.5'                      => '5.5'
  *
  * @since 1.4.1
  * @param  string $version  Version number

diff --git a/includes/functions-install.php b/includes/functions-install.php
@@ -20,7 +20,7 @@ function yourls_check_database_version() {
 }
 
 /**
- * Get DB version
+ * Get DB server version
  *
  * @since 1.7
  * @return string sanitized DB version