diff --git "a/C:\\Documents and Settings\\Administrator\\Desktop\\Patches\\statistics-clean-up-documentation-1313510-27_0.patch" "b/C:\\Documents and Settings\\Administrator\\Desktop\\Patches\\statistics-clean-up-documentation-1313510-34.patch" index 1ff6c8b..2bf5305 100644 --- "a/C:\\Documents and Settings\\Administrator\\Desktop\\Patches\\statistics-clean-up-documentation-1313510-27_0.patch" +++ "b/C:\\Documents and Settings\\Administrator\\Desktop\\Patches\\statistics-clean-up-documentation-1313510-34.patch" @@ -103,7 +103,7 @@ index 6606b8b..cefe79b 100644 * @ingroup forms * @see system_settings_form() diff --git a/core/modules/statistics/statistics.module b/core/modules/statistics/statistics.module -index 6f01535..f76783d 100644 +index eda808f..6816dea 100644 --- a/core/modules/statistics/statistics.module +++ b/core/modules/statistics/statistics.module @@ -2,7 +2,7 @@ @@ -194,7 +194,7 @@ index 6f01535..f76783d 100644 } +/** -+ * Creates a link for text to a path, truncates the width of the text if needed. ++ * Formats an item for display, including both the item title and the link. + * + * @param string $title + * The text to link to a path; will be truncated to a maximum width of 35. @@ -208,7 +208,7 @@ index 6f01535..f76783d 100644 $path = ($path ? $path : '/'); $output = ($title ? "$title
" : ''); diff --git a/core/modules/statistics/statistics.pages.inc b/core/modules/statistics/statistics.pages.inc -index bb31f98..9fdc30f 100644 +index 1d91609..fe87d9c 100644 --- a/core/modules/statistics/statistics.pages.inc +++ b/core/modules/statistics/statistics.pages.inc @@ -2,9 +2,18 @@ @@ -248,10 +248,10 @@ index bb31f98..9fdc30f 100644 if ($account = user_load(arg(1))) { diff --git a/core/modules/statistics/statistics.test b/core/modules/statistics/statistics.test -index 1b7f8ac..5b9be90 100644 +index 592f165..96e8d7b 100644 --- a/core/modules/statistics/statistics.test +++ b/core/modules/statistics/statistics.test -@@ -6,10 +6,15 @@ +@@ -6,10 +6,9 @@ */ /** @@ -259,16 +259,11 @@ index 1b7f8ac..5b9be90 100644 + * Defines a base class for testing statistics.module */ class StatisticsTestCase extends DrupalWebTestCase { - -+ /** -+ * Overrides DrupalWebTestCase::setUp(). -+ * -+ * @see DrupalWebTestCase::setUp() -+ */ +- function setUp() { parent::setUp('statistics'); -@@ -48,10 +53,13 @@ class StatisticsTestCase extends DrupalWebTestCase { +@@ -48,8 +47,8 @@ class StatisticsTestCase extends DrupalWebTestCase { /** * Tests that logging via statistics_exit() works for cached and uncached pages. * @@ -278,35 +273,8 @@ index 1b7f8ac..5b9be90 100644 + * want to test requests from an anonymous user. */ class StatisticsLoggingTestCase extends DrupalWebTestCase { -+ /** -+ * Overrides DrupalWebTestCase::getInfo(). -+ */ public static function getInfo() { - return array( - 'name' => 'Statistics logging tests', -@@ -60,6 +68,11 @@ class StatisticsLoggingTestCase extends DrupalWebTestCase { - ); - } - -+ /** -+ * Overrides DrupalWebTestCase::setUp(). -+ * -+ * @see DrupalWebTestCase::setUp() -+ */ - function setUp() { - parent::setUp('statistics'); - -@@ -135,6 +148,9 @@ class StatisticsLoggingTestCase extends DrupalWebTestCase { - * Tests that report pages render properly, and that access logging works. - */ - class StatisticsReportsTestCase extends StatisticsTestCase { -+ /** -+ * Overrides StatisticsTestCase::getInfo(). -+ */ - public static function getInfo() { - return array( - 'name' => 'Statistics reports tests', -@@ -222,9 +238,12 @@ class StatisticsReportsTestCase extends StatisticsTestCase { +@@ -232,7 +231,7 @@ class StatisticsReportsTestCase extends StatisticsTestCase { } /** @@ -314,13 +282,8 @@ index 1b7f8ac..5b9be90 100644 + * Tests that visitor blocking functionality works. */ class StatisticsBlockVisitorsTestCase extends StatisticsTestCase { -+ /** -+ * Overrides StatisticsTestCase::getInfo(). -+ */ public static function getInfo() { - return array( - 'name' => 'Top visitor blocking', -@@ -272,12 +291,29 @@ class StatisticsBlockVisitorsTestCase extends StatisticsTestCase { +@@ -282,10 +281,24 @@ class StatisticsBlockVisitorsTestCase extends StatisticsTestCase { } /** @@ -345,25 +308,8 @@ index 1b7f8ac..5b9be90 100644 + */ protected $test_node; -+ /** -+ * Overrides DrupalWebTestCase::getInfo(). -+ */ public static function getInfo() { - return array( - 'name' => 'Test statistics admin.', -@@ -286,6 +322,11 @@ class StatisticsAdminTestCase extends DrupalWebTestCase { - ); - } - -+ /** -+ * Overrides DrupalWebTestCase::setUp(). -+ * -+ * @see DrupalWebTestCase::setUp() -+ */ - function setUp() { - parent::setUp('statistics'); - $this->privileged_user = $this->drupalCreateUser(array('access statistics', 'administer statistics', 'view post access counter', 'create page content')); -@@ -412,9 +453,12 @@ class StatisticsAdminTestCase extends DrupalWebTestCase { +@@ -422,7 +435,7 @@ class StatisticsAdminTestCase extends DrupalWebTestCase { } /** @@ -371,9 +317,4 @@ index 1b7f8ac..5b9be90 100644 + * Tests statistics token replacement in strings. */ class StatisticsTokenReplaceTestCase extends StatisticsTestCase { -+ /** -+ * Overrides StatisticsTestCase::getInfo(). -+ */ public static function getInfo() { - return array( - 'name' => 'Statistics token replacement',